diff --git a/Scripts/Accounting/Accounts.cs b/Scripts/Accounting/Accounts.cs index f5258f110..21c54b4c9 100644 --- a/Scripts/Accounting/Accounts.cs +++ b/Scripts/Accounting/Accounts.cs @@ -20,7 +20,7 @@ namespace Server.Accounting { } - public static int Count { get { return m_Accounts.Count; } } + public static int Count => m_Accounts.Count; public static ICollection GetAccounts() { @@ -38,7 +38,7 @@ namespace Server.Accounting { m_Accounts[a.Username] = a; } - + public static void Remove( string username ) { m_Accounts.Remove( username ); diff --git a/Scripts/Commands/Docs.cs b/Scripts/Commands/Docs.cs index 568d9b8c7..54b6644ba 100644 --- a/Scripts/Commands/Docs.cs +++ b/Scripts/Commands/Docs.cs @@ -181,8 +181,8 @@ namespace Server.Commands // m_Writer = Docs.GetWriter( "docs/types/", m_FileName ); } - public string FileName { get { return m_FileName; } } - public string TypeName { get { return m_TypeName; } } + public string FileName => m_FileName; + public string TypeName => m_TypeName; public string LinkName( string dirRoot ) { @@ -336,8 +336,7 @@ namespace Server.Commands string fullName = realType.FullName; string aliased = null;// = realType.Name; - TypeInfo info = null; - m_Types.TryGetValue( realType, out info ); + m_Types.TryGetValue( realType, out TypeInfo info ); if( info != null ) { @@ -1419,8 +1418,8 @@ namespace Server.Commands private int m_Index; private List m_Strings; - public int Index { get { return m_Index; } } - public List Strings { get { return m_Strings; } } + public int Index => m_Index; + public List Strings => m_Strings; public SpeechEntry( int index ) { @@ -1471,8 +1470,7 @@ namespace Server.Commands lastIndex = index; - SpeechEntry entry = null; - table.TryGetValue( index, out entry ); + table.TryGetValue( index, out SpeechEntry entry ); if( entry == null ) table[index] = entry = new SpeechEntry( index ); @@ -1496,11 +1494,11 @@ namespace Server.Commands private string m_Usage; private string m_Description; - public AccessLevel AccessLevel { get { return m_AccessLevel; } } - public string Name { get { return m_Name; } } - public string[] Aliases { get { return m_Aliases; } } - public string Usage { get { return m_Usage; } } - public string Description { get { return m_Description; } } + public AccessLevel AccessLevel => m_AccessLevel; + public string Name => m_Name; + public string[] Aliases => m_Aliases; + public string Usage => m_Usage; + public string Description => m_Description; public DocCommandEntry( AccessLevel accessLevel, string name, string[] aliases, string usage, string description ) { @@ -1767,8 +1765,7 @@ namespace Server.Commands TypeInfo info = new TypeInfo( type ); m_Types[type] = info; - List nspaces = null; - m_Namespaces.TryGetValue( nspace, out nspaces ); + m_Namespaces.TryGetValue( nspace, out List nspaces ); if( nspaces == null ) m_Namespaces[nspace] = nspaces = new List(); @@ -1779,8 +1776,7 @@ namespace Server.Commands if( baseType != null && InAssemblies( baseType, asms ) ) { - TypeInfo baseInfo = null; - m_Types.TryGetValue( baseType, out baseInfo ); + m_Types.TryGetValue( baseType, out TypeInfo baseInfo ); if( baseInfo == null ) m_Types[baseType] = baseInfo = new TypeInfo( baseType ); @@ -1795,8 +1791,7 @@ namespace Server.Commands if( decType != null ) { - TypeInfo decInfo = null; - m_Types.TryGetValue( decType, out decInfo ); + m_Types.TryGetValue( decType, out TypeInfo decInfo ); if( decInfo == null ) m_Types[decType] = decInfo = new TypeInfo( decType ); @@ -1814,8 +1809,7 @@ namespace Server.Commands if( !InAssemblies( iface, asms ) ) continue; - TypeInfo ifaceInfo = null; - m_Types.TryGetValue( iface, out ifaceInfo ); + m_Types.TryGetValue( iface, out TypeInfo ifaceInfo ); if( ifaceInfo == null ) m_Types[iface] = ifaceInfo = new TypeInfo( iface ); @@ -1948,8 +1942,7 @@ namespace Server.Commands { html.Write( " m_Body; + public ModelBodyType BodyType => m_BodyType; + public string Name => m_Name; public BodyEntry( Body body, ModelBodyType bodyType, string name ) { diff --git a/Scripts/Commands/Generic/Extensions/BaseExtension.cs b/Scripts/Commands/Generic/Extensions/BaseExtension.cs index 574d01baa..2dd46128c 100644 --- a/Scripts/Commands/Generic/Extensions/BaseExtension.cs +++ b/Scripts/Commands/Generic/Extensions/BaseExtension.cs @@ -97,9 +97,7 @@ namespace Server.Commands.Generic for ( int i = args.Length - 1; i >= 0; --i ) { - ExtensionInfo extInfo = null; - - if ( !ExtensionInfo.Table.TryGetValue( args[i], out extInfo ) ) + if ( !ExtensionInfo.Table.TryGetValue( args[i], out ExtensionInfo extInfo ) ) continue; if ( extInfo.IsFixedSize && i != ( size - extInfo.Size - 1 ) ) diff --git a/Scripts/Commands/Generic/Extensions/Compilers/ConditionalCompiler.cs b/Scripts/Commands/Generic/Extensions/Compilers/ConditionalCompiler.cs index 3e438b3ba..499eb8adb 100644 --- a/Scripts/Commands/Generic/Extensions/Compilers/ConditionalCompiler.cs +++ b/Scripts/Commands/Generic/Extensions/Compilers/ConditionalCompiler.cs @@ -566,4 +566,4 @@ namespace Server.Commands.Generic return (IConditional) Activator.CreateInstance( conditionalType ); } } -} \ No newline at end of file +} diff --git a/Scripts/Commands/Generic/Extensions/Compilers/DistinctCompiler.cs b/Scripts/Commands/Generic/Extensions/Compilers/DistinctCompiler.cs index e1717284c..3c49414de 100644 --- a/Scripts/Commands/Generic/Extensions/Compilers/DistinctCompiler.cs +++ b/Scripts/Commands/Generic/Extensions/Compilers/DistinctCompiler.cs @@ -246,4 +246,4 @@ namespace Server.Commands.Generic return (IComparer) Activator.CreateInstance( comparerType ); } } -} \ No newline at end of file +} diff --git a/Scripts/Commands/Generic/Extensions/Compilers/SortCompiler.cs b/Scripts/Commands/Generic/Extensions/Compilers/SortCompiler.cs index 8c4f5be1f..386aa8a88 100644 --- a/Scripts/Commands/Generic/Extensions/Compilers/SortCompiler.cs +++ b/Scripts/Commands/Generic/Extensions/Compilers/SortCompiler.cs @@ -169,4 +169,4 @@ namespace Server.Commands.Generic return (IComparer) Activator.CreateInstance( comparerType ); } } -} \ No newline at end of file +} diff --git a/Scripts/Commands/Generic/Implementors/BaseCommandImplementor.cs b/Scripts/Commands/Generic/Implementors/BaseCommandImplementor.cs index 8c0a36215..989f176f8 100644 --- a/Scripts/Commands/Generic/Implementors/BaseCommandImplementor.cs +++ b/Scripts/Commands/Generic/Implementors/BaseCommandImplementor.cs @@ -282,8 +282,7 @@ namespace Server.Commands.Generic { if ( e.Length >= 1 ) { - BaseCommand command = null; - m_Commands.TryGetValue( e.GetString( 0 ), out command ); + m_Commands.TryGetValue( e.GetString( 0 ), out BaseCommand command ); if ( command == null ) { @@ -341,4 +340,4 @@ namespace Server.Commands.Generic } } } -} \ No newline at end of file +} diff --git a/Scripts/Commands/Generic/Implementors/RangeCommandImplementor.cs b/Scripts/Commands/Generic/Implementors/RangeCommandImplementor.cs index 92b4e8382..72a402c08 100644 --- a/Scripts/Commands/Generic/Implementors/RangeCommandImplementor.cs +++ b/Scripts/Commands/Generic/Implementors/RangeCommandImplementor.cs @@ -36,8 +36,7 @@ namespace Server.Commands.Generic } else { - BaseCommand command = null; - Commands.TryGetValue( e.GetString( 1 ), out command ); + Commands.TryGetValue( e.GetString( 1 ), out BaseCommand command ); if ( command == null ) { diff --git a/Scripts/Commands/Generic/Implementors/SerialCommandImplementor.cs b/Scripts/Commands/Generic/Implementors/SerialCommandImplementor.cs index 7ff08d6ee..7211d9c46 100644 --- a/Scripts/Commands/Generic/Implementors/SerialCommandImplementor.cs +++ b/Scripts/Commands/Generic/Implementors/SerialCommandImplementor.cs @@ -35,8 +35,7 @@ namespace Server.Commands.Generic } else { - BaseCommand command = null; - Commands.TryGetValue( e.GetString( 1 ), out command ); + Commands.TryGetValue( e.GetString( 1 ), out BaseCommand command ); if ( command == null ) { @@ -98,4 +97,4 @@ namespace Server.Commands.Generic } } } -} \ No newline at end of file +} diff --git a/Scripts/Commands/Generic/Implementors/SingleCommandImplementor.cs b/Scripts/Commands/Generic/Implementors/SingleCommandImplementor.cs index 1f01bce5c..a8fbfbabf 100644 --- a/Scripts/Commands/Generic/Implementors/SingleCommandImplementor.cs +++ b/Scripts/Commands/Generic/Implementors/SingleCommandImplementor.cs @@ -26,9 +26,7 @@ namespace Server.Commands.Generic public void Redirect( CommandEventArgs e ) { - BaseCommand command = null; - - Commands.TryGetValue( e.Command, out command ); + Commands.TryGetValue( e.Command, out BaseCommand command ); if ( command == null ) e.Mobile.SendMessage( "That is either an invalid command name or one that does not support this modifier." ); @@ -93,4 +91,4 @@ namespace Server.Commands.Generic RunCommand( from, targeted, command, args ); } } -} \ No newline at end of file +} diff --git a/Scripts/Commands/HelpInfo.cs b/Scripts/Commands/HelpInfo.cs index 3392ac08e..57657950e 100644 --- a/Scripts/Commands/HelpInfo.cs +++ b/Scripts/Commands/HelpInfo.cs @@ -19,8 +19,8 @@ namespace Server.Commands private static Dictionary m_HelpInfos = new Dictionary(); private static List m_SortedHelpInfo = new List(); //No need for SortedList cause it's only sorted once at creation... - public static Dictionary HelpInfos{ get { return m_HelpInfos; } } - public static List SortedHelpInfo { get { return m_SortedHelpInfo; } } + public static Dictionary HelpInfos => m_HelpInfos; + public static List SortedHelpInfo => m_SortedHelpInfo; [CallPriority( 100 )] public static void Initialize() @@ -37,9 +37,7 @@ namespace Server.Commands if( e.Length > 0 ) { string arg = e.GetString( 0 ).ToLower(); - CommandInfo c; - - if( m_HelpInfos.TryGetValue( arg, out c ) ) + if (m_HelpInfos.TryGetValue( arg, out CommandInfo c )) { Mobile m = e.Mobile; @@ -419,4 +417,4 @@ namespace Server.Commands } } } -} \ No newline at end of file +} diff --git a/Scripts/Engines/BulkOrders/LargeBOD.cs b/Scripts/Engines/BulkOrders/LargeBOD.cs index 9414181f9..53816c441 100644 --- a/Scripts/Engines/BulkOrders/LargeBOD.cs +++ b/Scripts/Engines/BulkOrders/LargeBOD.cs @@ -80,7 +80,7 @@ namespace Server.Engines.BulkOrders return BulkMaterialType.None; } - public override int LabelNumber{ get{ return 1045151; } } // a bulk order deed + public override int LabelNumber => 1045151; // a bulk order deed public LargeBOD( int hue, int amountMax, bool requireExeptional, BulkMaterialType material, LargeBulkEntry[] entries ) : base( Core.AOS ? 0x2258 : 0x14EF ) { @@ -265,4 +265,4 @@ namespace Server.Engines.BulkOrders Delete(); } } -} \ No newline at end of file +} diff --git a/Scripts/Engines/BulkOrders/LargeBulkEntry.cs b/Scripts/Engines/BulkOrders/LargeBulkEntry.cs index 2a88039a5..3c32eace7 100644 --- a/Scripts/Engines/BulkOrders/LargeBulkEntry.cs +++ b/Scripts/Engines/BulkOrders/LargeBulkEntry.cs @@ -134,14 +134,10 @@ namespace Server.Engines.BulkOrders if (m_Cache == null) m_Cache = new Dictionary>(); - Dictionary table = null; - - if (!m_Cache.TryGetValue(type, out table)) + if (!m_Cache.TryGetValue( type, out Dictionary table )) m_Cache[type] = table = new Dictionary(); - SmallBulkEntry[] entries = null; - - if (!table.TryGetValue(name, out entries)) + if (!table.TryGetValue( name, out SmallBulkEntry[] entries )) table[name] = entries = SmallBulkEntry.LoadEntries(type, name); return entries; @@ -186,4 +182,4 @@ namespace Server.Engines.BulkOrders writer.Write( m_Details.Graphic ); } } -} \ No newline at end of file +} diff --git a/Scripts/Engines/BulkOrders/SmallBOD.cs b/Scripts/Engines/BulkOrders/SmallBOD.cs index 494432aef..f78cede43 100644 --- a/Scripts/Engines/BulkOrders/SmallBOD.cs +++ b/Scripts/Engines/BulkOrders/SmallBOD.cs @@ -41,7 +41,7 @@ namespace Server.Engines.BulkOrders [CommandProperty( AccessLevel.GameMaster )] public bool Complete{ get{ return ( m_AmountCur == m_AmountMax ); } } - public override int LabelNumber{ get{ return 1045151; } } // a bulk order deed + public override int LabelNumber => 1045151; // a bulk order deed [Constructible] public SmallBOD( int hue, int amountMax, Type type, int number, int graphic, bool requireExeptional, BulkMaterialType material ) : base( Core.AOS ? 0x2258 : 0x14EF ) @@ -288,4 +288,4 @@ namespace Server.Engines.BulkOrders Delete(); } } -} \ No newline at end of file +} diff --git a/Scripts/Engines/BulkOrders/SmallBulkEntry.cs b/Scripts/Engines/BulkOrders/SmallBulkEntry.cs index 732a2a761..191b2142e 100644 --- a/Scripts/Engines/BulkOrders/SmallBulkEntry.cs +++ b/Scripts/Engines/BulkOrders/SmallBulkEntry.cs @@ -49,14 +49,10 @@ namespace Server.Engines.BulkOrders if ( m_Cache == null ) m_Cache = new Dictionary>(); - Dictionary table = null; - - if (!m_Cache.TryGetValue(type, out table)) + if (!m_Cache.TryGetValue( type, out Dictionary table )) m_Cache[type] = table = new Dictionary(); - SmallBulkEntry[] entries = null; - - if (!table.TryGetValue(name, out entries)) + if (!table.TryGetValue( name, out SmallBulkEntry[] entries )) table[name] = entries = LoadEntries(type, name); return entries; @@ -107,4 +103,4 @@ namespace Server.Engines.BulkOrders return list.ToArray(); } } -} \ No newline at end of file +} diff --git a/Scripts/Engines/CannedEvil/ChampionSkull.cs b/Scripts/Engines/CannedEvil/ChampionSkull.cs index b066f4cf1..95007b73a 100644 --- a/Scripts/Engines/CannedEvil/ChampionSkull.cs +++ b/Scripts/Engines/CannedEvil/ChampionSkull.cs @@ -11,7 +11,7 @@ namespace Server.Items [CommandProperty( AccessLevel.GameMaster )] public ChampionSkullType Type{ get{ return m_Type; } set{ m_Type = value; InvalidateProperties(); } } - public override int LabelNumber{ get{ return 1049479 + (int)m_Type; } } + public override int LabelNumber => 1049479 + (int)m_Type; [Constructible] public ChampionSkull( ChampionSkullType type ) : base( 0x1AE1 ) @@ -59,15 +59,15 @@ namespace Server.Items break; } } - + if( version == 0 ) { if ( LootType != LootType.Cursed ) LootType = LootType.Cursed; - + if ( Insured ) Insured = false; } } } -} \ No newline at end of file +} diff --git a/Scripts/Engines/CannedEvil/ChampionSkullBrazier.cs b/Scripts/Engines/CannedEvil/ChampionSkullBrazier.cs index c45e7d457..50aa10c84 100644 --- a/Scripts/Engines/CannedEvil/ChampionSkullBrazier.cs +++ b/Scripts/Engines/CannedEvil/ChampionSkullBrazier.cs @@ -22,7 +22,7 @@ namespace Server.Engines.CannedEvil [CommandProperty( AccessLevel.GameMaster )] public Item Skull{ get{ return m_Skull; } set{ m_Skull = value; if ( m_Platform != null ) m_Platform.Validate(); } } - public override int LabelNumber{ get{ return 1049489 + (int)m_Type; } } + public override int LabelNumber => 1049489 + (int)m_Type; public ChampionSkullBrazier( ChampionSkullPlatform platform, ChampionSkullType type ) : base( 0x19BB ) { @@ -170,4 +170,4 @@ namespace Server.Engines.CannedEvil Light = LightType.Circle300; } } -} \ No newline at end of file +} diff --git a/Scripts/Engines/CannedEvil/ChampionSpawn.cs b/Scripts/Engines/CannedEvil/ChampionSpawn.cs index e47f948e7..665daf7bb 100644 --- a/Scripts/Engines/CannedEvil/ChampionSpawn.cs +++ b/Scripts/Engines/CannedEvil/ChampionSpawn.cs @@ -1288,7 +1288,7 @@ namespace Server.Engines.CannedEvil { private ChampionSpawn m_Spawn; - public ChampionSpawn Spawn { get { return m_Spawn; } } + public ChampionSpawn Spawn => m_Spawn; public override string DefaultName { diff --git a/Scripts/Engines/CannedEvil/ChampionSpawnType.cs b/Scripts/Engines/CannedEvil/ChampionSpawnType.cs index 1886ab399..2d12f66d9 100644 --- a/Scripts/Engines/CannedEvil/ChampionSpawnType.cs +++ b/Scripts/Engines/CannedEvil/ChampionSpawnType.cs @@ -24,10 +24,10 @@ namespace Server.Engines.CannedEvil private Type[][] m_SpawnTypes; private string[] m_LevelNames; - public string Name { get { return m_Name; } } - public Type Champion { get { return m_Champion; } } - public Type[][] SpawnTypes { get { return m_SpawnTypes; } } - public string[] LevelNames { get { return m_LevelNames; } } + public string Name => m_Name; + public Type Champion => m_Champion; + public Type[][] SpawnTypes => m_SpawnTypes; + public string[] LevelNames => m_LevelNames; public ChampionSpawnInfo( string name, Type champion, string[] levelNames, Type[][] spawnTypes ) { @@ -37,7 +37,7 @@ namespace Server.Engines.CannedEvil m_SpawnTypes = spawnTypes; } - public static ChampionSpawnInfo[] Table{ get { return m_Table; } } + public static ChampionSpawnInfo[] Table => m_Table; private static readonly ChampionSpawnInfo[] m_Table = new ChampionSpawnInfo[] { diff --git a/Scripts/Engines/CannedEvil/HarrowerGate.cs b/Scripts/Engines/CannedEvil/HarrowerGate.cs index 9bf8e2e25..a7b138d46 100644 --- a/Scripts/Engines/CannedEvil/HarrowerGate.cs +++ b/Scripts/Engines/CannedEvil/HarrowerGate.cs @@ -7,7 +7,7 @@ namespace Server.Items { private Mobile m_Harrower; - public override int LabelNumber{ get{ return 1049498; } } // dark moongate + public override int LabelNumber => 1049498; // dark moongate public HarrowerGate( Mobile harrower, Point3D loc, Map map, Point3D targLoc, Map targMap ) : base( targLoc, targMap ) { @@ -56,4 +56,4 @@ namespace Server.Items Light = LightType.Circle300; } } -} \ No newline at end of file +} diff --git a/Scripts/Engines/CannedEvil/StarRoomGate.cs b/Scripts/Engines/CannedEvil/StarRoomGate.cs index b57bf4316..216848a6f 100644 --- a/Scripts/Engines/CannedEvil/StarRoomGate.cs +++ b/Scripts/Engines/CannedEvil/StarRoomGate.cs @@ -9,7 +9,7 @@ namespace Server.Items private DateTime m_DecayTime; private Timer m_Timer; - public override int LabelNumber{ get{ return 1049498; } } // dark moongate + public override int LabelNumber => 1049498; // dark moongate [Constructible] public StarRoomGate() : this( false ) @@ -103,4 +103,4 @@ namespace Server.Items } } } -} \ No newline at end of file +} diff --git a/Scripts/Engines/Chat/ChatUser.cs b/Scripts/Engines/Chat/ChatUser.cs index cce68835d..6c7d3c6fd 100644 --- a/Scripts/Engines/Chat/ChatUser.cs +++ b/Scripts/Engines/Chat/ChatUser.cs @@ -107,7 +107,7 @@ namespace Server.Engines.Chat m_IgnorePrivateMessage = value; } } - + public const char NormalColorCharacter = '0'; public const char ModeratorColorCharacter = '1'; public const char VoicedColorCharacter = '2'; @@ -249,7 +249,7 @@ namespace Server.Engines.Chat m_Users.Remove( user ); m_Table.Remove( user.m_Mobile ); - } + } } public static void RemoveChatUser( Mobile from ) @@ -261,8 +261,7 @@ namespace Server.Engines.Chat public static ChatUser GetChatUser( Mobile from ) { - ChatUser c; - m_Table.TryGetValue( from, out c ); + m_Table.TryGetValue( from, out ChatUser c ); return c; } @@ -318,4 +317,4 @@ namespace Server.Engines.Chat } } } -} \ No newline at end of file +} diff --git a/Scripts/Engines/ConPVP/DuelContext.cs b/Scripts/Engines/ConPVP/DuelContext.cs index e5123eb81..cddde19b2 100644 --- a/Scripts/Engines/ConPVP/DuelContext.cs +++ b/Scripts/Engines/ConPVP/DuelContext.cs @@ -2437,7 +2437,7 @@ namespace Server.Engines.ConPVP public TournyMatch m_Match; public EventGame m_EventGame; - public Tournament Tournament { get { return m_Tournament; } } + public Tournament Tournament => m_Tournament; public void SendReadyGump( int count ) { @@ -2491,7 +2491,7 @@ namespace Server.Engines.ConPVP } Arena arena = m_OverrideArena; - + if ( arena == null ) arena = Arena.FindArena( players ); @@ -2701,4 +2701,4 @@ namespace Server.Engines.ConPVP } }*/ } -} \ No newline at end of file +} diff --git a/Scripts/Engines/ConPVP/Games/BombingRun.cs b/Scripts/Engines/ConPVP/Games/BombingRun.cs index 2dc7c0ddd..8b8fe7635 100644 --- a/Scripts/Engines/ConPVP/Games/BombingRun.cs +++ b/Scripts/Engines/ConPVP/Games/BombingRun.cs @@ -705,7 +705,7 @@ namespace Server.Engines.ConPVP } } - public Mobile Thrower { get { return m_Thrower; } } + public Mobile Thrower => m_Thrower; public bool CheckScore( BRGoal goal, Mobile m, int points ) { @@ -1178,7 +1178,7 @@ namespace Server.Engines.ConPVP private int m_Score; - public Mobile Player { get { return m_Player; } } + public Mobile Player => m_Player; public int CompareTo( object obj ) { @@ -1287,7 +1287,7 @@ namespace Server.Engines.ConPVP } public BRGame Game { get { return m_Game; } set { m_Game = value; } } - public int TeamID { get { return m_TeamID; } } + public int TeamID => m_TeamID; public int Kills { get { return m_Kills; } set { m_Kills = value; } } public int Captures { get { return m_Captures; } set { m_Captures = value; } } @@ -1426,7 +1426,7 @@ namespace Server.Engines.ConPVP private TimeSpan m_Duration; private Point3D m_BombHome; - public BRTeamInfo[] TeamInfo { get { return m_TeamInfo; } } + public BRTeamInfo[] TeamInfo => m_TeamInfo; [CommandProperty( AccessLevel.GameMaster )] public BRTeamInfo Team1 { get { return m_TeamInfo[0]; } set { } } @@ -1571,7 +1571,7 @@ namespace Server.Engines.ConPVP private BRController m_Controller; - public BRController Controller { get { return m_Controller; } } + public BRController Controller => m_Controller; public void Alert( string text ) { diff --git a/Scripts/Engines/ConPVP/Games/CTF.cs b/Scripts/Engines/ConPVP/Games/CTF.cs index 91903d844..df83f8710 100644 --- a/Scripts/Engines/ConPVP/Games/CTF.cs +++ b/Scripts/Engines/ConPVP/Games/CTF.cs @@ -401,7 +401,7 @@ namespace Server.Engines.ConPVP { if ( m_TeamInfo == null ) return; - + if ( !IsChildOf( from.Backpack ) ) return; @@ -549,7 +549,7 @@ namespace Server.Engines.ConPVP private int m_Score; - public Mobile Player { get { return m_Player; } } + public Mobile Player => m_Player; string IRankedCTF.Name { @@ -632,7 +632,7 @@ namespace Server.Engines.ConPVP } public CTFGame Game { get { return m_Game; } set { m_Game = value; } } - public int TeamID { get { return m_TeamID; } } + public int TeamID => m_TeamID; public int Kills { get { return m_Kills; } set { m_Kills = value; } } public int Captures { get { return m_Captures; } set { m_Captures = value; } } @@ -666,9 +666,7 @@ namespace Server.Engines.ConPVP if ( mob == null ) return null; - CTFPlayerInfo val; - - if ( !m_Players.TryGetValue( mob, out val ) ) + if (!m_Players.TryGetValue( mob, out CTFPlayerInfo val )) m_Players[mob] = val = new CTFPlayerInfo( this, mob ); return val; @@ -789,7 +787,7 @@ namespace Server.Engines.ConPVP private TimeSpan m_Duration; - public CTFTeamInfo[] TeamInfo { get { return m_TeamInfo; } } + public CTFTeamInfo[] TeamInfo => m_TeamInfo; [CommandProperty( AccessLevel.GameMaster )] public CTFTeamInfo Team1 { get { return m_TeamInfo[0]; } set { } } @@ -919,7 +917,7 @@ namespace Server.Engines.ConPVP private CTFController m_Controller; - public CTFController Controller { get { return m_Controller; } } + public CTFController Controller => m_Controller; public void Alert( string text ) { @@ -1329,4 +1327,4 @@ namespace Server.Engines.ConPVP m_FinishTimer = null; } } -} \ No newline at end of file +} diff --git a/Scripts/Engines/ConPVP/Games/DoubleDom.cs b/Scripts/Engines/ConPVP/Games/DoubleDom.cs index 888187b8d..20e80e8ec 100644 --- a/Scripts/Engines/ConPVP/Games/DoubleDom.cs +++ b/Scripts/Engines/ConPVP/Games/DoubleDom.cs @@ -240,7 +240,7 @@ namespace Server.Engines.ConPVP private int m_Score; - public Mobile Player { get { return m_Player; } } + public Mobile Player => m_Player; public string Name { @@ -322,7 +322,7 @@ namespace Server.Engines.ConPVP } public DDGame Game { get { return m_Game; } set { m_Game = value; } } - public int TeamID { get { return m_TeamID; } } + public int TeamID => m_TeamID; public int Kills { get { return m_Kills; } set { m_Kills = value; } } public int Captures { get { return m_Captures; } set { m_Captures = value; } } @@ -356,9 +356,7 @@ namespace Server.Engines.ConPVP if ( mob == null ) return null; - DDPlayerInfo val; - - if ( !m_Players.TryGetValue( mob, out val ) ) + if (!m_Players.TryGetValue( mob, out DDPlayerInfo val )) m_Players[mob] = val = new DDPlayerInfo( this, mob ); return val; @@ -449,7 +447,7 @@ namespace Server.Engines.ConPVP private TimeSpan m_Duration; - public DDTeamInfo[] TeamInfo { get { return m_TeamInfo; } } + public DDTeamInfo[] TeamInfo => m_TeamInfo; [CommandProperty( AccessLevel.GameMaster )] public DDTeamInfo Team1 { get { return m_TeamInfo[0]; } set { } } @@ -487,7 +485,7 @@ namespace Server.Engines.ConPVP return new DDGame( this, context ); } - public override string DefaultName { get { return "DD Controller"; } } + public override string DefaultName => "DD Controller"; [Constructible] public DDController() @@ -554,7 +552,7 @@ namespace Server.Engines.ConPVP { private DDController m_Controller; - public DDController Controller { get { return m_Controller; } } + public DDController Controller => m_Controller; public void Alert( string text ) { diff --git a/Scripts/Engines/ConPVP/Games/EventGame.cs b/Scripts/Engines/ConPVP/Games/EventGame.cs index 6207f1910..78677904f 100644 --- a/Scripts/Engines/ConPVP/Games/EventGame.cs +++ b/Scripts/Engines/ConPVP/Games/EventGame.cs @@ -51,9 +51,9 @@ namespace Server.Engines.ConPVP { protected DuelContext m_Context; - public DuelContext Context { get { return m_Context; } } + public DuelContext Context => m_Context; - public virtual bool FreeConsume { get { return true; } } + public virtual bool FreeConsume => true; public EventGame( DuelContext context ) { @@ -78,4 +78,4 @@ namespace Server.Engines.ConPVP { } } -} \ No newline at end of file +} diff --git a/Scripts/Engines/ConPVP/Games/KingOfTheHill.cs b/Scripts/Engines/ConPVP/Games/KingOfTheHill.cs index 14571fe43..2ba60e8dd 100644 --- a/Scripts/Engines/ConPVP/Games/KingOfTheHill.cs +++ b/Scripts/Engines/ConPVP/Games/KingOfTheHill.cs @@ -210,7 +210,7 @@ namespace Server.Engines.ConPVP private int m_Total; private int m_Counter; - public int Captures { get { return m_Total; } } + public int Captures => m_Total; public KingTimer(HillOfTheKing hill) : base(TimeSpan.FromSeconds(1.0), TimeSpan.FromSeconds(1.0)) @@ -537,7 +537,7 @@ namespace Server.Engines.ConPVP m_Player = player; } - public Mobile Player { get { return m_Player; } } + public Mobile Player => m_Player; public int CompareTo(object obj) { @@ -647,7 +647,7 @@ namespace Server.Engines.ConPVP } public KHGame Game { get { return m_Game; } set { m_Game = value; } } - public int TeamID { get { return m_TeamID; } } + public int TeamID => m_TeamID; public int Kills { get { return m_Kills; } set { m_Kills = value; } } public int Captures { get { return m_Captures; } set { m_Captures = value; } } @@ -756,7 +756,7 @@ namespace Server.Engines.ConPVP private TimeSpan m_Duration; private int m_ScoreInterval; - public KHTeamInfo[] TeamInfo { get { return m_TeamInfo; } } + public KHTeamInfo[] TeamInfo => m_TeamInfo; [CommandProperty(AccessLevel.GameMaster)] public KHTeamInfo Team1_W { get { return m_TeamInfo[0]; } set { } } @@ -782,7 +782,7 @@ namespace Server.Engines.ConPVP [CommandProperty(AccessLevel.GameMaster)] public KHTeamInfo Team8_NE { get { return m_TeamInfo[7]; } set { } } - public HillOfTheKing[] Hills { get { return m_Hills; } } + public HillOfTheKing[] Hills => m_Hills; [CommandProperty(AccessLevel.GameMaster)] public HillOfTheKing Hill1 { get { return m_Hills[0]; } set { m_Hills[0] = value; } } @@ -796,7 +796,7 @@ namespace Server.Engines.ConPVP [CommandProperty(AccessLevel.GameMaster)] public HillOfTheKing Hill4 { get { return m_Hills[3]; } set { m_Hills[3] = value; } } - public ArrayList Boards { get { return m_Boards; } } + public ArrayList Boards => m_Boards; [CommandProperty(AccessLevel.GameMaster)] public TimeSpan Duration @@ -911,7 +911,7 @@ namespace Server.Engines.ConPVP { private KHController m_Controller; - public KHController Controller { get { return m_Controller; } } + public KHController Controller => m_Controller; public override bool CantDoAnything(Mobile mob) { diff --git a/Scripts/Engines/Craft/Core/CraftContext.cs b/Scripts/Engines/Craft/Core/CraftContext.cs index 254626c66..b3f9d8067 100644 --- a/Scripts/Engines/Craft/Core/CraftContext.cs +++ b/Scripts/Engines/Craft/Core/CraftContext.cs @@ -20,7 +20,7 @@ namespace Server.Engines.Craft private bool m_DoNotColor; private CraftMarkOption m_MarkOption; - public List Items { get { return m_Items; } } + public List Items => m_Items; public int LastResourceIndex{ get{ return m_LastResourceIndex; } set{ m_LastResourceIndex = value; } } public int LastResourceIndex2{ get{ return m_LastResourceIndex2; } set{ m_LastResourceIndex2 = value; } } public int LastGroupIndex{ get{ return m_LastGroupIndex; } set{ m_LastGroupIndex = value; } } @@ -56,4 +56,4 @@ namespace Server.Engines.Craft m_Items.Insert( 0, item ); } } -} \ No newline at end of file +} diff --git a/Scripts/Engines/Craft/Core/CraftItem.cs b/Scripts/Engines/Craft/Core/CraftItem.cs index 8633f8a21..1a7d7ed1e 100644 --- a/Scripts/Engines/Craft/Core/CraftItem.cs +++ b/Scripts/Engines/Craft/Core/CraftItem.cs @@ -93,11 +93,9 @@ namespace Server.Engines.Craft } private static Dictionary _itemIds = new Dictionary(); - - public static int ItemIDOf( Type type ) { - int itemId; - if ( !_itemIds.TryGetValue( type, out itemId ) ) { + public static int ItemIDOf( Type type ) { + if (!_itemIds.TryGetValue( type, out int itemId )) { if ( type == typeof( FactionExplosionTrap ) ) { itemId = 14034; } else if ( type == typeof( FactionGasTrap ) ) { @@ -323,7 +321,7 @@ namespace Server.Engines.Craft 0x398C, 0x399F, // Fire field 0x2DDB, 0x2DDC, //Elven stove 0x19AA, 0x19BB, // Veteran Reward Brazier - 0x197A, 0x19A9, // Large Forge + 0x197A, 0x19A9, // Large Forge 0x0FB1, 0x0FB1, // Small Forge 0x2DD8, 0x2DD8 // Elven Forge }; @@ -753,7 +751,7 @@ namespace Server.Engines.Craft return false; } } - + int index = 0; // Consume ALL @@ -872,7 +870,7 @@ namespace Server.Engines.Craft if ( from.Talisman is BaseTalisman ) { BaseTalisman talisman = (BaseTalisman) from.Talisman; - + if ( talisman.Skill == system.MainSkill ) { chance -= talisman.SuccessBonus / 100.0; @@ -960,7 +958,7 @@ namespace Server.Engines.Craft if ( allRequiredSkills && from.Talisman is BaseTalisman ) { BaseTalisman talisman = (BaseTalisman) from.Talisman; - + if ( talisman.Skill == craftSystem.MainSkill ) chance += talisman.SuccessBonus / 100.0; } diff --git a/Scripts/Engines/Craft/Core/CraftSystem.cs b/Scripts/Engines/Craft/Core/CraftSystem.cs index 6093588fa..40bac5cd9 100644 --- a/Scripts/Engines/Craft/Core/CraftSystem.cs +++ b/Scripts/Engines/Craft/Core/CraftSystem.cs @@ -29,14 +29,14 @@ namespace Server.Engines.Craft private List m_Recipes; private List m_RareRecipes; - public int MinCraftEffect { get { return m_MinCraftEffect; } } - public int MaxCraftEffect { get { return m_MaxCraftEffect; } } - public double Delay { get { return m_Delay; } } + public int MinCraftEffect => m_MinCraftEffect; + public int MaxCraftEffect => m_MaxCraftEffect; + public double Delay => m_Delay; - public CraftItemCol CraftItems{ get { return m_CraftItems; } } - public CraftGroupCol CraftGroups{ get { return m_CraftGroups; } } - public CraftSubResCol CraftSubRes{ get { return m_CraftSubRes; } } - public CraftSubResCol CraftSubRes2{ get { return m_CraftSubRes2; } } + public CraftItemCol CraftItems => m_CraftItems; + public CraftGroupCol CraftGroups => m_CraftGroups; + public CraftSubResCol CraftSubRes => m_CraftSubRes; + public CraftSubResCol CraftSubRes2 => m_CraftSubRes2; public abstract SkillName MainSkill{ get; } @@ -65,8 +65,7 @@ namespace Server.Engines.Craft return null; } - CraftContext c = null; - m_ContextTable.TryGetValue( m, out c ); + m_ContextTable.TryGetValue( m, out CraftContext c ); if ( c == null ) m_ContextTable[m] = c = new CraftContext(); @@ -129,7 +128,7 @@ namespace Server.Engines.Craft } public void CreateItem( Mobile from, Type type, Type typeRes, BaseTool tool, CraftItem realCraftItem ) - { + { // Verify if the type is in the list of the craftable item CraftItem craftItem = m_CraftItems.SearchFor( type ); if ( craftItem != null ) @@ -224,7 +223,7 @@ namespace Server.Engines.Craft CraftItem craftItem = m_CraftItems.GetAt( index ); craftItem.Hits = hits; } - + public void SetUseAllRes( int index, bool useAll ) { CraftItem craftItem = m_CraftItems.GetAt( index ); @@ -386,4 +385,4 @@ namespace Server.Engines.Craft public abstract int CanCraft( Mobile from, BaseTool tool, Type itemType ); } -} \ No newline at end of file +} diff --git a/Scripts/Engines/Craft/Core/Recipes.cs b/Scripts/Engines/Craft/Core/Recipes.cs index 475e21a22..e75133aa0 100644 --- a/Scripts/Engines/Craft/Core/Recipes.cs +++ b/Scripts/Engines/Craft/Core/Recipes.cs @@ -66,7 +66,7 @@ namespace Server.Engines.Craft private static Dictionary m_Recipes = new Dictionary(); - public static Dictionary Recipes { get { return m_Recipes; } } + public static Dictionary Recipes => m_Recipes; private static int m_LargestRecipeID; public static int LargestRecipeID{ get{ return m_LargestRecipeID; } } diff --git a/Scripts/Engines/Craft/DefBlacksmithy.cs b/Scripts/Engines/Craft/DefBlacksmithy.cs index e57dd8153..469a05910 100644 --- a/Scripts/Engines/Craft/DefBlacksmithy.cs +++ b/Scripts/Engines/Craft/DefBlacksmithy.cs @@ -28,7 +28,7 @@ namespace Server.Engines.Craft } } - public override CraftECA ECA{ get{ return CraftECA.ChanceMinusSixtyToFourtyFive; } } + public override CraftECA ECA => CraftECA.ChanceMinusSixtyToFourtyFive; public override double GetChanceAtMin( CraftItem item ) { @@ -38,17 +38,17 @@ namespace Server.Engines.Craft private DefBlacksmithy() : base( 1, 1, 1.25 )// base( 1, 2, 1.7 ) { /* - + base( MinCraftEffect, MaxCraftEffect, Delay ) - + MinCraftEffect : The minimum number of time the mobile will play the craft effect MaxCraftEffect : The maximum number of time the mobile will play the craft effect Delay : The delay between each craft effect - + Example: (3, 6, 1.7) would make the mobile do the PlayCraftEffect override function between 3 and 6 time, with a 1.7 second delay each time. - - */ + + */ } private static Type typeofAnvil = typeof( AnvilAttribute ); @@ -178,7 +178,7 @@ namespace Server.Engines.Craft return 1044156; // You create an exceptional quality item and affix your maker's mark. else if ( quality == 2 ) return 1044155; // You create an exceptional quality item. - else + else return 1044154; // You create the item. } } @@ -188,7 +188,7 @@ namespace Server.Engines.Craft /* Synthax for a SIMPLE craft item AddCraft( ObjectType, Group, MinSkill, MaxSkill, ResourceType, Amount, Message ) - + ObjectType : The type of the object you want to add to the build list. Group : The group in wich the object will be showed in the craft menu. MinSkill : The minimum of skill value @@ -196,10 +196,10 @@ namespace Server.Engines.Craft ResourceType : The type of the resource the mobile need to create the item Amount : The amount of the ResourceType it need to create the item Message : String or Int for Localized. The message that will be sent to the mobile, if the specified resource is missing. - + Synthax for a COMPLEXE craft item. A complexe item is an item that need either more than only one skill, or more than only one resource. - + Coming soon.... */ @@ -245,7 +245,7 @@ namespace Server.Engines.Craft index = AddCraft( typeof( PlateHaidate ), 1011078, 1030200, 65.0, 115.0, typeof( IronIngot ), 1044036, 20, 1044037 ); SetNeededExpansion( index, Expansion.SE ); - + } #endregion @@ -266,16 +266,16 @@ namespace Server.Engines.Craft index = AddCraft( typeof( HeavyPlateJingasa ), 1011079, 1030178, 45.0, 95.0, typeof( IronIngot ), 1044036, 20, 1044037 ); SetNeededExpansion( index, Expansion.SE ); - + index = AddCraft( typeof( LightPlateJingasa ), 1011079, 1030188, 45.0, 95.0, typeof( IronIngot ), 1044036, 20, 1044037 ); SetNeededExpansion( index, Expansion.SE ); - + index = AddCraft( typeof( SmallPlateJingasa ), 1011079, 1030191, 45.0, 95.0, typeof( IronIngot ), 1044036, 20, 1044037 ); SetNeededExpansion( index, Expansion.SE ); index = AddCraft( typeof( DecorativePlateKabuto ), 1011079, 1030179, 90.0, 140.0, typeof( IronIngot ), 1044036, 25, 1044037 ); SetNeededExpansion( index, Expansion.SE ); - + index = AddCraft( typeof( PlateBattleKabuto ), 1011079, 1030192, 90.0, 140.0, typeof( IronIngot ), 1044036, 25, 1044037 ); SetNeededExpansion( index, Expansion.SE ); @@ -589,7 +589,7 @@ namespace Server.Engines.Craft AddRes( index, typeof( Turquoise ), 1032691, 1, 1044240 ); AddRecipe( index, 36 ); SetNeededExpansion( index, Expansion.ML ); - + } #endregion @@ -693,7 +693,7 @@ namespace Server.Engines.Craft index = AddCraft( typeof( DragonChest ), 1053114, 1029793, 85.0, 135.0, typeof( RedScales ), 1060883, 36, 1060884 ); SetUseSubRes2( index, true ); #endregion - + // Set the overridable material SetSubRes( typeof( IronIngot ), 1044022 ); diff --git a/Scripts/Engines/Craft/DefBowFletching.cs b/Scripts/Engines/Craft/DefBowFletching.cs index b315e065e..f2bfb4fc6 100644 --- a/Scripts/Engines/Craft/DefBowFletching.cs +++ b/Scripts/Engines/Craft/DefBowFletching.cs @@ -76,12 +76,12 @@ namespace Server.Engines.Craft return 1044156; // You create an exceptional quality item and affix your maker's mark. else if ( quality == 2 ) return 1044155; // You create an exceptional quality item. - else + else return 1044154; // You create the item. } } - public override CraftECA ECA{ get{ return CraftECA.FiftyPercentChanceMinusTenPercent; } } + public override CraftECA ECA => CraftECA.FiftyPercentChanceMinusTenPercent; public override void InitCraftList() { @@ -217,4 +217,4 @@ namespace Server.Engines.Craft Repair = Core.AOS; } } -} \ No newline at end of file +} diff --git a/Scripts/Engines/Craft/DefCooking.cs b/Scripts/Engines/Craft/DefCooking.cs index 906c8bb36..efca67840 100644 --- a/Scripts/Engines/Craft/DefCooking.cs +++ b/Scripts/Engines/Craft/DefCooking.cs @@ -28,7 +28,7 @@ namespace Server.Engines.Craft } } - public override CraftECA ECA{ get{ return CraftECA.ChanceMinusSixtyToFourtyFive; } } + public override CraftECA ECA => CraftECA.ChanceMinusSixtyToFourtyFive; public override double GetChanceAtMin( CraftItem item ) { @@ -73,7 +73,7 @@ namespace Server.Engines.Craft return 1044156; // You create an exceptional quality item and affix your maker's mark. else if ( quality == 2 ) return 1044155; // You create an exceptional quality item. - else + else return 1044154; // You create the item. } } diff --git a/Scripts/Engines/Craft/DefTailoring.cs b/Scripts/Engines/Craft/DefTailoring.cs index c48c0d741..a855d55a2 100644 --- a/Scripts/Engines/Craft/DefTailoring.cs +++ b/Scripts/Engines/Craft/DefTailoring.cs @@ -28,7 +28,7 @@ namespace Server.Engines.Craft } } - public override CraftECA ECA{ get{ return CraftECA.ChanceMinusSixtyToFourtyFive; } } + public override CraftECA ECA => CraftECA.ChanceMinusSixtyToFourtyFive; public override double GetChanceAtMin( CraftItem item ) { @@ -97,7 +97,7 @@ namespace Server.Engines.Craft return 1044156; // You create an exceptional quality item and affix your maker's mark. else if ( quality == 2 ) return 1044155; // You create an exceptional quality item. - else + else return 1044154; // You create the item. } } @@ -128,7 +128,7 @@ namespace Server.Engines.Craft index = AddCraft( typeof( ClothNinjaHood ), 1011375, 1030202, 80.0, 105.0, typeof( Cloth ), 1044286, 13, 1044287 ); SetNeededExpansion( index, Expansion.SE ); - index = AddCraft( typeof( Kasa ), 1011375, 1030211, 60.0, 85.0, typeof( Cloth ), 1044286, 12, 1044287 ); + index = AddCraft( typeof( Kasa ), 1011375, 1030211, 60.0, 85.0, typeof( Cloth ), 1044286, 12, 1044287 ); SetNeededExpansion( index, Expansion.SE ); } #endregion @@ -368,7 +368,7 @@ namespace Server.Engines.Craft #region Bone Armor index = AddCraft( typeof( BoneHelm ), 1049149, 1025206, 85.0, 110.0, typeof( Leather ), 1044462, 4, 1044463 ); AddRes( index, typeof( Bone ), 1049064, 2, 1049063 ); - + index = AddCraft( typeof( BoneGloves ), 1049149, 1025205, 89.0, 114.0, typeof( Leather ), 1044462, 6, 1044463 ); AddRes( index, typeof( Bone ), 1049064, 2, 1049063 ); @@ -377,7 +377,7 @@ namespace Server.Engines.Craft index = AddCraft( typeof( BoneLegs ), 1049149, 1025202, 95.0, 120.0, typeof( Leather ), 1044462, 10, 1044463 ); AddRes( index, typeof( Bone ), 1049064, 6, 1049063 ); - + index = AddCraft( typeof( BoneChest ), 1049149, 1025199, 96.0, 121.0, typeof( Leather ), 1044462, 12, 1044463 ); AddRes( index, typeof( Bone ), 1049064, 10, 1049063 ); @@ -400,4 +400,4 @@ namespace Server.Engines.Craft CanEnhance = Core.AOS; } } -} \ No newline at end of file +} diff --git a/Scripts/Engines/Craft/DefTinkering.cs b/Scripts/Engines/Craft/DefTinkering.cs index 79d3ced6c..d7331c4f8 100644 --- a/Scripts/Engines/Craft/DefTinkering.cs +++ b/Scripts/Engines/Craft/DefTinkering.cs @@ -110,7 +110,7 @@ namespace Server.Engines.Craft return 1044156; // You create an exceptional quality item and affix your maker's mark. else if ( quality == 2 ) return 1044155; // You create an exceptional quality item. - else + else return 1044154; // You create the item. } } @@ -326,7 +326,7 @@ namespace Server.Engines.Craft AddRes( index, typeof( IronIngot ), 1044036, 10, 1044037 ); AddRes( index, typeof( Gears ), 1044254, 1, 1044253 ); - // Faction Spike Trap + // Faction Spike Trap index = AddCraft( typeof( FactionSpikeTrapDeed ), 1044052, 1044601, 65.0, 115.0, typeof( Silver ), 1044572, Core.AOS ? 250 : 1000, 1044253 ); AddRes( index, typeof( IronIngot ), 1044036, 10, 1044037 ); AddRes( index, typeof( Springs ), 1044171, 1, 1044253 ); @@ -498,7 +498,7 @@ namespace Server.Engines.Craft [CraftItemID( 0x1BFC )] public class DartTrapCraft : TrapCraft { - public override TrapType TrapType{ get{ return TrapType.DartTrap; } } + public override TrapType TrapType => TrapType.DartTrap; public DartTrapCraft( Mobile from, CraftItem craftItem, CraftSystem craftSystem, Type typeRes, BaseTool tool, int quality ) : base( from, craftItem, craftSystem, typeRes, tool, quality ) { @@ -508,7 +508,7 @@ namespace Server.Engines.Craft [CraftItemID( 0x113E )] public class PoisonTrapCraft : TrapCraft { - public override TrapType TrapType{ get{ return TrapType.PoisonTrap; } } + public override TrapType TrapType => TrapType.PoisonTrap; public PoisonTrapCraft( Mobile from, CraftItem craftItem, CraftSystem craftSystem, Type typeRes, BaseTool tool, int quality ) : base( from, craftItem, craftSystem, typeRes, tool, quality ) { @@ -518,10 +518,10 @@ namespace Server.Engines.Craft [CraftItemID( 0x370C )] public class ExplosionTrapCraft : TrapCraft { - public override TrapType TrapType{ get{ return TrapType.ExplosionTrap; } } + public override TrapType TrapType => TrapType.ExplosionTrap; public ExplosionTrapCraft( Mobile from, CraftItem craftItem, CraftSystem craftSystem, Type typeRes, BaseTool tool, int quality ) : base( from, craftItem, craftSystem, typeRes, tool, quality ) { } } -} \ No newline at end of file +} diff --git a/Scripts/Engines/Ethics/Core/Persistance.cs b/Scripts/Engines/Ethics/Core/Persistance.cs index a14d8ddc2..3cd401482 100644 --- a/Scripts/Engines/Ethics/Core/Persistance.cs +++ b/Scripts/Engines/Ethics/Core/Persistance.cs @@ -6,7 +6,7 @@ namespace Server.Ethics { private static EthicsPersistance m_Instance; - public static EthicsPersistance Instance { get { return m_Instance; } } + public static EthicsPersistance Instance => m_Instance; public override string DefaultName { @@ -63,4 +63,4 @@ namespace Server.Ethics { } } -} \ No newline at end of file +} diff --git a/Scripts/Engines/Ethics/Core/Player.cs b/Scripts/Engines/Ethics/Core/Player.cs index 7d36892ea..6d625c462 100644 --- a/Scripts/Engines/Ethics/Core/Player.cs +++ b/Scripts/Engines/Ethics/Core/Player.cs @@ -56,8 +56,8 @@ namespace Server.Ethics private DateTime m_Shield; - public Ethic Ethic { get { return m_Ethic; } } - public Mobile Mobile { get { return m_Mobile; } } + public Ethic Ethic => m_Ethic; + public Mobile Mobile => m_Mobile; [CommandProperty( AccessLevel.GameMaster, AccessLevel.Administrator )] public int Power { get { return m_Power; } set { m_Power = value; } } diff --git a/Scripts/Engines/Ethics/Core/Power.cs b/Scripts/Engines/Ethics/Core/Power.cs index bc5b4ba96..95c2f735c 100644 --- a/Scripts/Engines/Ethics/Core/Power.cs +++ b/Scripts/Engines/Ethics/Core/Power.cs @@ -8,7 +8,7 @@ namespace Server.Ethics { protected PowerDefinition m_Definition; - public PowerDefinition Definition { get { return m_Definition; } } + public PowerDefinition Definition => m_Definition; public virtual bool CheckInvoke( Player from ) { @@ -31,4 +31,4 @@ namespace Server.Ethics from.Power -= m_Definition.Power; } } -} \ No newline at end of file +} diff --git a/Scripts/Engines/Ethics/Definitions/EthicDefinition.cs b/Scripts/Engines/Ethics/Definitions/EthicDefinition.cs index 39b680320..f02bc18e9 100644 --- a/Scripts/Engines/Ethics/Definitions/EthicDefinition.cs +++ b/Scripts/Engines/Ethics/Definitions/EthicDefinition.cs @@ -15,14 +15,14 @@ namespace Server.Ethics private Power[] m_Powers; - public int PrimaryHue { get { return m_PrimaryHue; } } + public int PrimaryHue => m_PrimaryHue; - public TextDefinition Title { get { return m_Title; } } - public TextDefinition Adjunct { get { return m_Adjunct; } } + public TextDefinition Title => m_Title; + public TextDefinition Adjunct => m_Adjunct; - public TextDefinition JoinPhrase { get { return m_JoinPhrase; } } + public TextDefinition JoinPhrase => m_JoinPhrase; - public Power[] Powers { get { return m_Powers; } } + public Power[] Powers => m_Powers; public EthicDefinition( int primaryHue, TextDefinition title, TextDefinition adjunct, TextDefinition joinPhrase, Power[] powers ) { diff --git a/Scripts/Engines/Ethics/Definitions/PowerDefinition.cs b/Scripts/Engines/Ethics/Definitions/PowerDefinition.cs index 86af47a4d..3e9130b69 100644 --- a/Scripts/Engines/Ethics/Definitions/PowerDefinition.cs +++ b/Scripts/Engines/Ethics/Definitions/PowerDefinition.cs @@ -12,11 +12,11 @@ namespace Server.Ethics private TextDefinition m_Phrase; private TextDefinition m_Description; - public int Power { get { return m_Power; } } + public int Power => m_Power; - public TextDefinition Name { get { return m_Name; } } - public TextDefinition Phrase { get { return m_Phrase; } } - public TextDefinition Description { get { return m_Description; } } + public TextDefinition Name => m_Name; + public TextDefinition Phrase => m_Phrase; + public TextDefinition Description => m_Description; public PowerDefinition( int power, TextDefinition name, TextDefinition phrase, TextDefinition description ) { diff --git a/Scripts/Engines/Ethics/Evil/Mobiles/UnholyFamiliar.cs b/Scripts/Engines/Ethics/Evil/Mobiles/UnholyFamiliar.cs index a3a5783bc..d41895037 100644 --- a/Scripts/Engines/Ethics/Evil/Mobiles/UnholyFamiliar.cs +++ b/Scripts/Engines/Ethics/Evil/Mobiles/UnholyFamiliar.cs @@ -49,10 +49,10 @@ namespace Server.Mobiles ControlSlots = 1; } - public override int Meat { get { return 1; } } - public override int Hides { get { return 7; } } - public override FoodType FavoriteFood { get { return FoodType.Meat; } } - public override PackInstinct PackInstinct { get { return PackInstinct.Canine; } } + public override int Meat => 1; + public override int Hides => 7; + public override FoodType FavoriteFood => FoodType.Meat; + public override PackInstinct PackInstinct => PackInstinct.Canine; public UnholyFamiliar( Serial serial ) : base( serial ) diff --git a/Scripts/Engines/Ethics/Evil/Mobiles/UnholySteed.cs b/Scripts/Engines/Ethics/Evil/Mobiles/UnholySteed.cs index 2313b3232..17835870b 100644 --- a/Scripts/Engines/Ethics/Evil/Mobiles/UnholySteed.cs +++ b/Scripts/Engines/Ethics/Evil/Mobiles/UnholySteed.cs @@ -49,7 +49,7 @@ namespace Server.Mobiles ControlSlots = 1; } - public override FoodType FavoriteFood { get { return FoodType.FruitsAndVegies | FoodType.GrainsAndHay; } } + public override FoodType FavoriteFood => FoodType.FruitsAndVegies | FoodType.GrainsAndHay; public UnholySteed( Serial serial ) : base( serial ) diff --git a/Scripts/Engines/Ethics/Hero/Mobiles/HolyFamiliar.cs b/Scripts/Engines/Ethics/Hero/Mobiles/HolyFamiliar.cs index 2ecef7a2d..d6871b8c3 100644 --- a/Scripts/Engines/Ethics/Hero/Mobiles/HolyFamiliar.cs +++ b/Scripts/Engines/Ethics/Hero/Mobiles/HolyFamiliar.cs @@ -50,10 +50,10 @@ namespace Server.Mobiles ControlSlots = 1; } - public override int Meat { get { return 1; } } - public override int Hides { get { return 7; } } - public override FoodType FavoriteFood { get { return FoodType.Meat; } } - public override PackInstinct PackInstinct { get { return PackInstinct.Canine; } } + public override int Meat => 1; + public override int Hides => 7; + public override FoodType FavoriteFood => FoodType.Meat; + public override PackInstinct PackInstinct => PackInstinct.Canine; public HolyFamiliar( Serial serial ) : base( serial ) diff --git a/Scripts/Engines/Ethics/Hero/Mobiles/HolySteed.cs b/Scripts/Engines/Ethics/Hero/Mobiles/HolySteed.cs index 84b66bfde..34d66181a 100644 --- a/Scripts/Engines/Ethics/Hero/Mobiles/HolySteed.cs +++ b/Scripts/Engines/Ethics/Hero/Mobiles/HolySteed.cs @@ -49,7 +49,7 @@ namespace Server.Mobiles ControlSlots = 1; } - public override FoodType FavoriteFood { get { return FoodType.FruitsAndVegies | FoodType.GrainsAndHay; } } + public override FoodType FavoriteFood => FoodType.FruitsAndVegies | FoodType.GrainsAndHay; public HolySteed( Serial serial ) : base( serial ) diff --git a/Scripts/Engines/Factions/Core/Election.cs b/Scripts/Engines/Factions/Core/Election.cs index c11ddf70d..4797c32a3 100644 --- a/Scripts/Engines/Factions/Core/Election.cs +++ b/Scripts/Engines/Factions/Core/Election.cs @@ -24,7 +24,7 @@ namespace Server.Factions public Faction Faction{ get{ return m_Faction; } } - public List Candidates { get { return m_Candidates; } } + public List Candidates => m_Candidates; public ElectionState State{ get{ return m_State; } set{ m_State = value; m_LastStateTime = DateTime.UtcNow; } } public DateTime LastStateTime{ get{ return m_LastStateTime; } } @@ -483,7 +483,7 @@ namespace Server.Factions private List m_Voters; public Mobile Mobile{ get{ return m_Mobile; } } - public List Voters { get { return m_Voters; } } + public List Voters => m_Voters; public int Votes{ get{ return m_Voters.Count; } } @@ -561,4 +561,4 @@ namespace Server.Factions Campaign, Election } -} \ No newline at end of file +} diff --git a/Scripts/Engines/Factions/Core/Faction.cs b/Scripts/Engines/Factions/Core/Faction.cs index 9b5def674..cc50ad80d 100644 --- a/Scripts/Engines/Factions/Core/Faction.cs +++ b/Scripts/Engines/Factions/Core/Faction.cs @@ -927,9 +927,7 @@ namespace Server.Factions public static bool ClearSkillLoss( Mobile mob ) { - SkillLossContext context; - - if ( !m_SkillLoss.TryGetValue( mob, out context ) ) + if (!m_SkillLoss.TryGetValue( mob, out SkillLossContext context )) return false; m_SkillLoss.Remove( mob ); @@ -1111,7 +1109,7 @@ namespace Server.Factions { if ( victimState.KillPoints <= -6 ) { - killer.SendLocalizedMessage( 501693 ); // This victim is not worth enough to get kill points from. + killer.SendLocalizedMessage( 501693 ); // This victim is not worth enough to get kill points from. #region Ethics Ethics.Player killerEPL = Ethics.Player.Find( killer ); @@ -1153,7 +1151,7 @@ namespace Server.Factions if ( 1 > Utility.Random( 3 ) ) killerState.IsActive = true; - + int silver = 0; silver = killerState.Faction.AwardSilver( killer, award * 40 ); diff --git a/Scripts/Engines/Factions/Core/PlayerState.cs b/Scripts/Engines/Factions/Core/PlayerState.cs index 21d98b142..bdaae0bab 100644 --- a/Scripts/Engines/Factions/Core/PlayerState.cs +++ b/Scripts/Engines/Factions/Core/PlayerState.cs @@ -24,15 +24,15 @@ namespace Server.Factions public Mobile Mobile{ get{ return m_Mobile; } } public Faction Faction{ get{ return m_Faction; } } - public List Owner { get { return m_Owner; } } + public List Owner => m_Owner; public MerchantTitle MerchantTitle{ get{ return m_MerchantTitle; } set{ m_MerchantTitle = value; Invalidate(); } } public Town Sheriff{ get{ return m_Sheriff; } set{ m_Sheriff = value; Invalidate(); } } public Town Finance{ get{ return m_Finance; } set{ m_Finance = value; Invalidate(); } } - public List SilverGiven { get { return m_SilverGiven; } } + public List SilverGiven => m_SilverGiven; - public int KillPoints { - get { return m_KillPoints; } - set { + public int KillPoints { + get { return m_KillPoints; } + set { if ( m_KillPoints != value ) { if ( value > m_KillPoints ) { if ( m_KillPoints <= 0 ) { @@ -41,7 +41,7 @@ namespace Server.Factions Invalidate(); return; } - + m_Owner.Remove( this ); m_Owner.Insert( m_Faction.ZeroRankOffset, this ); @@ -104,9 +104,9 @@ namespace Server.Factions private int m_RankIndex = -1; public int RankIndex { get { return m_RankIndex; } set { if ( m_RankIndex != value ) { m_RankIndex = value; m_InvalidateRank = true; } } } - - public RankDefinition Rank { - get { + + public RankDefinition Rank { + get { if ( m_InvalidateRank ) { RankDefinition[] ranks = m_Faction.Definition.Ranks; int percent; @@ -252,4 +252,4 @@ namespace Server.Factions return ((PlayerState)obj).m_KillPoints - m_KillPoints; } } -} \ No newline at end of file +} diff --git a/Scripts/Engines/Factions/Core/Town.cs b/Scripts/Engines/Factions/Core/Town.cs index ed680f761..b9e023223 100644 --- a/Scripts/Engines/Factions/Core/Town.cs +++ b/Scripts/Engines/Factions/Core/Town.cs @@ -436,7 +436,7 @@ namespace Server.Factions return ( mob.AccessLevel >= AccessLevel.GameMaster || mob == Finance ); } - public static List Towns { get { return Reflector.Towns; } } + public static List Towns => Reflector.Towns; public const int SilverCaptureBonus = 10000; @@ -551,4 +551,4 @@ namespace Server.Factions } } } -} \ No newline at end of file +} diff --git a/Scripts/Engines/Factions/Core/VendorList.cs b/Scripts/Engines/Factions/Core/VendorList.cs index b30b41f1d..e56f68cda 100644 --- a/Scripts/Engines/Factions/Core/VendorList.cs +++ b/Scripts/Engines/Factions/Core/VendorList.cs @@ -10,7 +10,7 @@ namespace Server.Factions private List m_Vendors; public VendorDefinition Definition{ get{ return m_Definition; } } - public List Vendors { get { return m_Vendors; } } + public List Vendors => m_Vendors; public BaseFactionVendor Construct( Town town, Faction faction ) { @@ -24,4 +24,4 @@ namespace Server.Factions m_Vendors = new List(); } } -} \ No newline at end of file +} diff --git a/Scripts/Engines/Factions/Definitions/FactionDefinition.cs b/Scripts/Engines/Factions/Definitions/FactionDefinition.cs index 7b7beb4df..d7fed74a5 100644 --- a/Scripts/Engines/Factions/Definitions/FactionDefinition.cs +++ b/Scripts/Engines/Factions/Definitions/FactionDefinition.cs @@ -47,7 +47,7 @@ namespace Server.Factions public string FriendlyName{ get{ return m_FriendlyName; } } public string Keyword{ get{ return m_Keyword; } } - public string Abbreviation{ get { return m_Abbreviation; } } + public string Abbreviation => m_Abbreviation; public TextDefinition Name{ get{ return m_Name; } } public TextDefinition PropName{ get{ return m_PropName; } } @@ -97,4 +97,4 @@ namespace Server.Factions m_Guards = guards; } } -} \ No newline at end of file +} diff --git a/Scripts/Engines/Factions/Gumps/FactionStoneGump.cs b/Scripts/Engines/Factions/Gumps/FactionStoneGump.cs index 4216f48d4..3d0282abd 100644 --- a/Scripts/Engines/Factions/Gumps/FactionStoneGump.cs +++ b/Scripts/Engines/Factions/Gumps/FactionStoneGump.cs @@ -12,7 +12,7 @@ namespace Server.Factions private PlayerMobile m_From; private Faction m_Faction; - public override int ButtonTypes{ get{ return 4; } } + public override int ButtonTypes => 4; public FactionStoneGump( PlayerMobile from, Faction faction ) : base( 20, 30 ) { @@ -29,16 +29,16 @@ namespace Server.Factions AddHtmlText( 20, 30, 510, 20, faction.Definition.Header, false, false ); - AddHtmlLocalized( 20, 60, 100, 20, 1011429, false, false ); // Led By : + AddHtmlLocalized( 20, 60, 100, 20, 1011429, false, false ); // Led By : AddHtml( 125, 60, 200, 20, faction.Commander != null ? faction.Commander.Name : "Nobody", false, false ); - AddHtmlLocalized( 20, 80, 100, 20, 1011457, false, false ); // Tithe rate : + AddHtmlLocalized( 20, 80, 100, 20, 1011457, false, false ); // Tithe rate : if ( faction.Tithe >= 0 && faction.Tithe <= 100 && (faction.Tithe % 10) == 0 ) AddHtmlLocalized( 125, 80, 350, 20, 1011480 + (faction.Tithe / 10), false, false ); else AddHtml( 125, 80, 350, 20, faction.Tithe + "%", false, false ); - AddHtmlLocalized( 20, 100, 100, 20, 1011458, false, false ); // Traps placed : + AddHtmlLocalized( 20, 100, 100, 20, 1011458, false, false ); // Traps placed : AddHtml( 125, 100, 50, 20, faction.Traps.Count.ToString(), false, false ); AddHtmlLocalized( 55, 225, 200, 20, 1011428, false, false ); // VOTE FOR LEADERSHIP @@ -126,13 +126,13 @@ namespace Server.Factions AddHtmlLocalized( 20, 30, 150, 20, 1011444, false, false ); // STATISTICS - AddHtmlLocalized( 20, 100, 100, 20, 1011445, false, false ); // Name : + AddHtmlLocalized( 20, 100, 100, 20, 1011445, false, false ); // Name : AddHtml( 120, 100, 150, 20, from.Name, false, false ); - AddHtmlLocalized( 20, 130, 100, 20, 1018064, false, false ); // score : + AddHtmlLocalized( 20, 130, 100, 20, 1018064, false, false ); // score : AddHtml( 120, 130, 100, 20, (pl != null ? pl.KillPoints : 0).ToString(), false, false ); - AddHtmlLocalized( 20, 160, 100, 20, 1011446, false, false ); // Rank : + AddHtmlLocalized( 20, 160, 100, 20, 1011446, false, false ); // Rank : AddHtml( 120, 160, 100, 20, (pl != null ? pl.Rank.Rank : 0).ToString(), false, false ); AddHtmlLocalized( 55, 250, 100, 20, 1011447, false, false ); // BACK @@ -175,13 +175,13 @@ namespace Server.Factions AddHtmlLocalized( 20, 30, 200, 20, 1011461, false, false ); // COMMANDER OPTIONS - AddHtmlLocalized( 20, 70, 120, 20, 1011457, false, false ); // Tithe rate : + AddHtmlLocalized( 20, 70, 120, 20, 1011457, false, false ); // Tithe rate : if ( faction.Tithe >= 0 && faction.Tithe <= 100 && (faction.Tithe % 10) == 0 ) AddHtmlLocalized( 140, 70, 250, 20, 1011480 + (faction.Tithe / 10), false, false ); else AddHtml( 140, 70, 250, 20, faction.Tithe + "%", false, false ); - AddHtmlLocalized( 20, 100, 120, 20, 1011474, false, false ); // Silver available : + AddHtmlLocalized( 20, 100, 120, 20, 1011474, false, false ); // Silver available : AddHtml( 140, 100, 50, 20, faction.Silver.ToString( "N0" ), false, false ); // NOTE: Added 'N0' formatting AddHtmlLocalized( 55, 130, 200, 20, 1011478, false, false ); // CHANGE TITHE RATE @@ -344,4 +344,4 @@ namespace Server.Factions } } } -} \ No newline at end of file +} diff --git a/Scripts/Engines/Factions/Gumps/FinanceGump.cs b/Scripts/Engines/Factions/Gumps/FinanceGump.cs index 64a491fa1..5ab5b77c5 100644 --- a/Scripts/Engines/Factions/Gumps/FinanceGump.cs +++ b/Scripts/Engines/Factions/Gumps/FinanceGump.cs @@ -21,7 +21,7 @@ namespace Server.Factions +50, +100, +150, +200, +250, +300 }; - public override int ButtonTypes{ get{ return 2; } } + public override int ButtonTypes => 2; public FinanceGump( PlayerMobile from, Faction faction, Town town ) : base( 50, 50 ) { @@ -44,7 +44,7 @@ namespace Server.Factions AddHtmlLocalized( 55, 90, 200, 25, 1011539, false, false ); // CHANGE PRICES AddButton( 20, 90, 4005, 4007, 0, GumpButtonType.Page, 2 ); - AddHtmlLocalized( 55, 120, 200, 25, 1011540, false, false ); // BUY SHOPKEEPERS + AddHtmlLocalized( 55, 120, 200, 25, 1011540, false, false ); // BUY SHOPKEEPERS AddButton( 20, 120, 4005, 4007, 0, GumpButtonType.Page, 3 ); AddHtmlLocalized( 55, 150, 200, 25, 1011495, false, false ); // VIEW FINANCES @@ -114,20 +114,20 @@ namespace Server.Factions AddHtmlLocalized( 20, 30, 300, 25, 1011524, false, false ); // FINANCE STATEMENT - - AddHtmlLocalized( 20, 80, 300, 25, 1011538, false, false ); // Current total money for town : + + AddHtmlLocalized( 20, 80, 300, 25, 1011538, false, false ); // Current total money for town : AddLabel( 20, 100, 0x44, town.Silver.ToString() ); - AddHtmlLocalized( 20, 130, 300, 25, 1011520, false, false ); // Finance Minister Upkeep : + AddHtmlLocalized( 20, 130, 300, 25, 1011520, false, false ); // Finance Minister Upkeep : AddLabel( 20, 150, 0x44, financeUpkeep.ToString( "N0" ) ); // NOTE: Added 'N0' - AddHtmlLocalized( 20, 180, 300, 25, 1011521, false, false ); // Sheriff Upkeep : + AddHtmlLocalized( 20, 180, 300, 25, 1011521, false, false ); // Sheriff Upkeep : AddLabel( 20, 200, 0x44, sheriffUpkeep.ToString( "N0" ) ); // NOTE: Added 'N0' - AddHtmlLocalized( 20, 230, 300, 25, 1011522, false, false ); // Town Income : + AddHtmlLocalized( 20, 230, 300, 25, 1011522, false, false ); // Town Income : AddLabel( 20, 250, 0x44, dailyIncome.ToString( "N0" ) ); // NOTE: Added 'N0' - AddHtmlLocalized( 20, 280, 300, 25, 1011523, false, false ); // Net Cash flow per day : + AddHtmlLocalized( 20, 280, 300, 25, 1011523, false, false ); // Net Cash flow per day : AddLabel( 20, 300, 0x44, netCashFlow.ToString( "N0" ) ); // NOTE: Added 'N0' AddHtmlLocalized( 55, 360, 200, 25, 1011067, false, false ); // Previous page @@ -144,10 +144,10 @@ namespace Server.Factions AddHtmlText( 60, 30, 300, 25, vendorList.Definition.Header, false, false ); AddItem( 20, 30, vendorList.Definition.ItemID ); - AddHtmlLocalized( 20, 90, 200, 25, 1011514, false, false ); // You have : + AddHtmlLocalized( 20, 90, 200, 25, 1011514, false, false ); // You have : AddLabel( 230, 90, 0x26, vendorList.Vendors.Count.ToString() ); - AddHtmlLocalized( 20, 120, 200, 25, 1011515, false, false ); // Maximum : + AddHtmlLocalized( 20, 120, 200, 25, 1011515, false, false ); // Maximum : AddLabel( 230, 120, 0x256, vendorList.Definition.Maximum.ToString() ); AddHtmlLocalized( 20, 150, 200, 25, 1011516, false, false ); // Cost : @@ -221,7 +221,7 @@ namespace Server.Factions m_From.SendLocalizedMessage( 1042167 ); // You must wait up to an hour before changing prices again. else if ( remaining.TotalHours < 4 ) m_From.SendLocalizedMessage( 1042168 ); // You must wait a few hours before changing prices again. - else + else m_From.SendLocalizedMessage( 1042169 ); // You must wait several hours before changing prices again. } else @@ -278,4 +278,4 @@ namespace Server.Factions } } } -} \ No newline at end of file +} diff --git a/Scripts/Engines/Factions/Items/FactionStone.cs b/Scripts/Engines/Factions/Items/FactionStone.cs index 133dc29f3..866a9af9b 100644 --- a/Scripts/Engines/Factions/Items/FactionStone.cs +++ b/Scripts/Engines/Factions/Items/FactionStone.cs @@ -21,7 +21,7 @@ namespace Server.Factions } } - public override string DefaultName { get { return "faction stone"; } } + public override string DefaultName => "faction stone"; [Constructible] public FactionStone() : this( null ) @@ -102,4 +102,4 @@ namespace Server.Factions } } } -} \ No newline at end of file +} diff --git a/Scripts/Engines/Factions/Items/JoinStone.cs b/Scripts/Engines/Factions/Items/JoinStone.cs index 8bb5148dc..931e9468f 100644 --- a/Scripts/Engines/Factions/Items/JoinStone.cs +++ b/Scripts/Engines/Factions/Items/JoinStone.cs @@ -22,7 +22,7 @@ namespace Server.Factions } } - public override string DefaultName { get { return "faction signup stone"; } } + public override string DefaultName => "faction signup stone"; [Constructible] public JoinStone() : this( null ) @@ -78,4 +78,4 @@ namespace Server.Factions } } } -} \ No newline at end of file +} diff --git a/Scripts/Engines/Factions/Items/StrongholdMonolith.cs b/Scripts/Engines/Factions/Items/StrongholdMonolith.cs index f65729eea..833de40e8 100644 --- a/Scripts/Engines/Factions/Items/StrongholdMonolith.cs +++ b/Scripts/Engines/Factions/Items/StrongholdMonolith.cs @@ -4,7 +4,7 @@ namespace Server.Factions { public class StrongholdMonolith : BaseMonolith { - public override int DefaultLabelNumber{ get{ return 1041042; } } // A Faction Sigil Monolith + public override int DefaultLabelNumber => 1041042; // A Faction Sigil Monolith public override void OnTownChanged() { @@ -37,4 +37,4 @@ namespace Server.Factions int version = reader.ReadInt(); } } -} \ No newline at end of file +} diff --git a/Scripts/Engines/Factions/Items/TownMonolith.cs b/Scripts/Engines/Factions/Items/TownMonolith.cs index 75cd500a5..c278c153c 100644 --- a/Scripts/Engines/Factions/Items/TownMonolith.cs +++ b/Scripts/Engines/Factions/Items/TownMonolith.cs @@ -4,7 +4,7 @@ namespace Server.Factions { public class TownMonolith : BaseMonolith { - public override int DefaultLabelNumber{ get{ return 1041403; } } // A Faction Town Sigil Monolith + public override int DefaultLabelNumber => 1041403; // A Faction Town Sigil Monolith public override void OnTownChanged() { @@ -37,4 +37,4 @@ namespace Server.Factions int version = reader.ReadInt(); } } -} \ No newline at end of file +} diff --git a/Scripts/Engines/Factions/Items/TownStone.cs b/Scripts/Engines/Factions/Items/TownStone.cs index f20bcc43e..f543a75f5 100644 --- a/Scripts/Engines/Factions/Items/TownStone.cs +++ b/Scripts/Engines/Factions/Items/TownStone.cs @@ -21,7 +21,7 @@ namespace Server.Factions } } - public override string DefaultName { get { return "faction town stone"; } } + public override string DefaultName => "faction town stone"; [Constructible] public TownStone() : this( null ) @@ -84,4 +84,4 @@ namespace Server.Factions } } } -} \ No newline at end of file +} diff --git a/Scripts/Engines/Factions/Items/Traps/FactionExplosionTrap.cs b/Scripts/Engines/Factions/Items/Traps/FactionExplosionTrap.cs index 0cc64ffd1..20672ff26 100644 --- a/Scripts/Engines/Factions/Items/Traps/FactionExplosionTrap.cs +++ b/Scripts/Engines/Factions/Items/Traps/FactionExplosionTrap.cs @@ -5,14 +5,14 @@ namespace Server.Factions { public class FactionExplosionTrap : BaseFactionTrap { - public override int LabelNumber{ get{ return 1044599; } } // faction explosion trap + public override int LabelNumber => 1044599; // faction explosion trap - public override int AttackMessage{ get{ return 1010543; } } // You are enveloped in an explosion of fire! - public override int DisarmMessage{ get{ return 1010539; } } // You carefully remove the pressure trigger and disable the trap. - public override int EffectSound{ get{ return 0x307; } } - public override int MessageHue{ get{ return 0x78; } } + public override int AttackMessage => 1010543; // You are enveloped in an explosion of fire! + public override int DisarmMessage => 1010539; // You carefully remove the pressure trigger and disable the trap. + public override int EffectSound => 0x307; + public override int MessageHue => 0x78; - public override AllowedPlacing AllowedPlacing{ get{ return AllowedPlacing.AnyFactionTown; } } + public override AllowedPlacing AllowedPlacing => AllowedPlacing.AnyFactionTown; public override void DoVisibleEffect() { @@ -58,13 +58,13 @@ namespace Server.Factions public class FactionExplosionTrapDeed : BaseFactionTrapDeed { - public override Type TrapType{ get{ return typeof( FactionExplosionTrap ); } } - public override int LabelNumber{ get{ return 1044603; } } // faction explosion trap deed + public override Type TrapType => typeof( FactionExplosionTrap ); + public override int LabelNumber => 1044603; // faction explosion trap deed public FactionExplosionTrapDeed() : base( 0x36D2 ) { } - + public FactionExplosionTrapDeed( Serial serial ) : base( serial ) { } @@ -82,4 +82,4 @@ namespace Server.Factions int version = reader.ReadInt(); } } -} \ No newline at end of file +} diff --git a/Scripts/Engines/Factions/Items/Traps/FactionGasTrap.cs b/Scripts/Engines/Factions/Items/Traps/FactionGasTrap.cs index a8ead8712..b728b81fb 100644 --- a/Scripts/Engines/Factions/Items/Traps/FactionGasTrap.cs +++ b/Scripts/Engines/Factions/Items/Traps/FactionGasTrap.cs @@ -5,14 +5,14 @@ namespace Server.Factions { public class FactionGasTrap : BaseFactionTrap { - public override int LabelNumber{ get{ return 1044598; } } // faction gas trap + public override int LabelNumber => 1044598; // faction gas trap - public override int AttackMessage{ get{ return 1010542; } } // A noxious green cloud of poison gas envelops you! - public override int DisarmMessage{ get{ return 502376; } } // The poison leaks harmlessly away due to your deft touch. - public override int EffectSound{ get{ return 0x230; } } - public override int MessageHue{ get{ return 0x44; } } + public override int AttackMessage => 1010542; // A noxious green cloud of poison gas envelops you! + public override int DisarmMessage => 502376; // The poison leaks harmlessly away due to your deft touch. + public override int EffectSound => 0x230; + public override int MessageHue => 0x44; - public override AllowedPlacing AllowedPlacing{ get{ return AllowedPlacing.FactionStronghold; } } + public override AllowedPlacing AllowedPlacing => AllowedPlacing.FactionStronghold; public override void DoVisibleEffect() { @@ -58,13 +58,13 @@ namespace Server.Factions public class FactionGasTrapDeed : BaseFactionTrapDeed { - public override Type TrapType{ get{ return typeof( FactionGasTrap ); } } - public override int LabelNumber{ get{ return 1044602; } } // faction gas trap deed + public override Type TrapType => typeof( FactionGasTrap ); + public override int LabelNumber => 1044602; // faction gas trap deed public FactionGasTrapDeed() : base( 0x11AB ) { } - + public FactionGasTrapDeed( Serial serial ) : base( serial ) { } @@ -82,4 +82,4 @@ namespace Server.Factions int version = reader.ReadInt(); } } -} \ No newline at end of file +} diff --git a/Scripts/Engines/Factions/Items/Traps/FactionSawTrap.cs b/Scripts/Engines/Factions/Items/Traps/FactionSawTrap.cs index 51e8907c0..c034a637e 100644 --- a/Scripts/Engines/Factions/Items/Traps/FactionSawTrap.cs +++ b/Scripts/Engines/Factions/Items/Traps/FactionSawTrap.cs @@ -5,14 +5,14 @@ namespace Server.Factions { public class FactionSawTrap : BaseFactionTrap { - public override int LabelNumber{ get{ return 1041047; } } // faction saw trap + public override int LabelNumber => 1041047; // faction saw trap - public override int AttackMessage{ get{ return 1010544; } } // The blade cuts deep into your skin! - public override int DisarmMessage{ get{ return 1010540; } } // You carefully dismantle the saw mechanism and disable the trap. - public override int EffectSound{ get{ return 0x218; } } - public override int MessageHue{ get{ return 0x5A; } } + public override int AttackMessage => 1010544; // The blade cuts deep into your skin! + public override int DisarmMessage => 1010540; // You carefully dismantle the saw mechanism and disable the trap. + public override int EffectSound => 0x218; + public override int MessageHue => 0x5A; - public override AllowedPlacing AllowedPlacing{ get{ return AllowedPlacing.ControlledFactionTown; } } + public override AllowedPlacing AllowedPlacing => AllowedPlacing.ControlledFactionTown; public override void DoVisibleEffect() { @@ -58,13 +58,13 @@ namespace Server.Factions public class FactionSawTrapDeed : BaseFactionTrapDeed { - public override Type TrapType{ get{ return typeof( FactionSawTrap ); } } - public override int LabelNumber{ get{ return 1044604; } } // faction saw trap deed + public override Type TrapType => typeof( FactionSawTrap ); + public override int LabelNumber => 1044604; // faction saw trap deed public FactionSawTrapDeed() : base( 0x1107 ) { } - + public FactionSawTrapDeed( Serial serial ) : base( serial ) { } @@ -82,4 +82,4 @@ namespace Server.Factions int version = reader.ReadInt(); } } -} \ No newline at end of file +} diff --git a/Scripts/Engines/Factions/Items/Traps/FactionSpikeTrap.cs b/Scripts/Engines/Factions/Items/Traps/FactionSpikeTrap.cs index 6c47908e8..97d872f1f 100644 --- a/Scripts/Engines/Factions/Items/Traps/FactionSpikeTrap.cs +++ b/Scripts/Engines/Factions/Items/Traps/FactionSpikeTrap.cs @@ -5,14 +5,14 @@ namespace Server.Factions { public class FactionSpikeTrap : BaseFactionTrap { - public override int LabelNumber{ get{ return 1044601; } } // faction spike trap + public override int LabelNumber => 1044601; // faction spike trap - public override int AttackMessage{ get{ return 1010545; } } // Large spikes in the ground spring up piercing your skin! - public override int DisarmMessage{ get{ return 1010541; } } // You carefully dismantle the trigger on the spikes and disable the trap. - public override int EffectSound{ get{ return 0x22E; } } - public override int MessageHue{ get{ return 0x5A; } } + public override int AttackMessage => 1010545; // Large spikes in the ground spring up piercing your skin! + public override int DisarmMessage => 1010541; // You carefully dismantle the trigger on the spikes and disable the trap. + public override int EffectSound => 0x22E; + public override int MessageHue => 0x5A; - public override AllowedPlacing AllowedPlacing{ get{ return AllowedPlacing.ControlledFactionTown; } } + public override AllowedPlacing AllowedPlacing => AllowedPlacing.ControlledFactionTown; public override void DoVisibleEffect() { @@ -58,13 +58,13 @@ namespace Server.Factions public class FactionSpikeTrapDeed : BaseFactionTrapDeed { - public override Type TrapType{ get{ return typeof( FactionSpikeTrap ); } } - public override int LabelNumber{ get{ return 1044605; } } // faction spike trap deed + public override Type TrapType => typeof( FactionSpikeTrap ); + public override int LabelNumber => 1044605; // faction spike trap deed public FactionSpikeTrapDeed() : base( 0x11A5 ) { } - + public FactionSpikeTrapDeed( Serial serial ) : base( serial ) { } @@ -82,4 +82,4 @@ namespace Server.Factions int version = reader.ReadInt(); } } -} \ No newline at end of file +} diff --git a/Scripts/Engines/Factions/Items/Traps/FactionTrapRemovalKit.cs b/Scripts/Engines/Factions/Items/Traps/FactionTrapRemovalKit.cs index 8defb2686..d722009fa 100644 --- a/Scripts/Engines/Factions/Items/Traps/FactionTrapRemovalKit.cs +++ b/Scripts/Engines/Factions/Items/Traps/FactionTrapRemovalKit.cs @@ -15,7 +15,7 @@ namespace Server.Factions set{ m_Charges = value; } } - public override int LabelNumber{ get{ return 1041508; } } // a faction trap removal kit + public override int LabelNumber => 1041508; // a faction trap removal kit [Constructible] public FactionTrapRemovalKit() : base( 7867 ) @@ -79,4 +79,4 @@ namespace Server.Factions } } } -} \ No newline at end of file +} diff --git a/Scripts/Engines/Factions/Mobiles/FactionWarHorse.cs b/Scripts/Engines/Factions/Mobiles/FactionWarHorse.cs index 4c92bdb98..aaa83be8d 100644 --- a/Scripts/Engines/Factions/Mobiles/FactionWarHorse.cs +++ b/Scripts/Engines/Factions/Mobiles/FactionWarHorse.cs @@ -64,7 +64,7 @@ namespace Server.Factions Faction = faction; } - public override FoodType FavoriteFood{ get{ return FoodType.FruitsAndVegies | FoodType.GrainsAndHay; } } + public override FoodType FavoriteFood => FoodType.FruitsAndVegies | FoodType.GrainsAndHay; public FactionWarHorse( Serial serial ) : base( serial ) { @@ -109,4 +109,4 @@ namespace Server.Factions } } } -} \ No newline at end of file +} diff --git a/Scripts/Engines/Factions/Mobiles/Guards/BaseFactionGuard.cs b/Scripts/Engines/Factions/Mobiles/Guards/BaseFactionGuard.cs index 628f9adfd..2780b7450 100644 --- a/Scripts/Engines/Factions/Mobiles/Guards/BaseFactionGuard.cs +++ b/Scripts/Engines/Factions/Mobiles/Guards/BaseFactionGuard.cs @@ -55,7 +55,7 @@ namespace Server.Factions get { return new FactionGuardAI( this ); } } - public override TimeSpan ReacquireDelay{ get{ return TimeSpan.FromSeconds( 2.0 ); } } + public override TimeSpan ReacquireDelay => TimeSpan.FromSeconds( 2.0 ); public override bool IsEnemy( Mobile m ) { diff --git a/Scripts/Engines/Factions/Mobiles/Guards/Types/FactionBerserker.cs b/Scripts/Engines/Factions/Mobiles/Guards/Types/FactionBerserker.cs index cd6a95828..75df7cbe1 100644 --- a/Scripts/Engines/Factions/Mobiles/Guards/Types/FactionBerserker.cs +++ b/Scripts/Engines/Factions/Mobiles/Guards/Types/FactionBerserker.cs @@ -6,7 +6,7 @@ namespace Server.Factions { public class FactionBerserker : BaseFactionGuard { - public override GuardAI GuardAI{ get{ return GuardAI.Melee | GuardAI.Curse | GuardAI.Bless; } } + public override GuardAI GuardAI => GuardAI.Melee | GuardAI.Curse | GuardAI.Bless; [Constructible] public FactionBerserker() : base( "the berserker" ) @@ -71,4 +71,4 @@ namespace Server.Factions int version = reader.ReadInt(); } } -} \ No newline at end of file +} diff --git a/Scripts/Engines/Factions/Mobiles/Guards/Types/FactionDeathKnight.cs b/Scripts/Engines/Factions/Mobiles/Guards/Types/FactionDeathKnight.cs index b206162d0..7200cccdc 100644 --- a/Scripts/Engines/Factions/Mobiles/Guards/Types/FactionDeathKnight.cs +++ b/Scripts/Engines/Factions/Mobiles/Guards/Types/FactionDeathKnight.cs @@ -6,7 +6,7 @@ namespace Server.Factions { public class FactionDeathKnight : BaseFactionGuard { - public override GuardAI GuardAI{ get{ return GuardAI.Melee | GuardAI.Curse | GuardAI.Bless; } } + public override GuardAI GuardAI => GuardAI.Melee | GuardAI.Curse | GuardAI.Bless; [Constructible] public FactionDeathKnight() : base( "the death knight" ) @@ -67,4 +67,4 @@ namespace Server.Factions int version = reader.ReadInt(); } } -} \ No newline at end of file +} diff --git a/Scripts/Engines/Factions/Mobiles/Guards/Types/FactionDragoon.cs b/Scripts/Engines/Factions/Mobiles/Guards/Types/FactionDragoon.cs index f9957ae4a..b65f0062a 100644 --- a/Scripts/Engines/Factions/Mobiles/Guards/Types/FactionDragoon.cs +++ b/Scripts/Engines/Factions/Mobiles/Guards/Types/FactionDragoon.cs @@ -7,7 +7,7 @@ namespace Server.Factions { public class FactionDragoon : BaseFactionGuard { - public override GuardAI GuardAI{ get{ return GuardAI.Magic | GuardAI.Melee | GuardAI.Smart | GuardAI.Bless | GuardAI.Curse; } } + public override GuardAI GuardAI => GuardAI.Magic | GuardAI.Melee | GuardAI.Smart | GuardAI.Bless | GuardAI.Curse; [Constructible] public FactionDragoon() : base( "the dragoon" ) @@ -72,4 +72,4 @@ namespace Server.Factions int version = reader.ReadInt(); } } -} \ No newline at end of file +} diff --git a/Scripts/Engines/Factions/Mobiles/Guards/Types/FactionHenchman.cs b/Scripts/Engines/Factions/Mobiles/Guards/Types/FactionHenchman.cs index 729ce1888..69cc4fac7 100644 --- a/Scripts/Engines/Factions/Mobiles/Guards/Types/FactionHenchman.cs +++ b/Scripts/Engines/Factions/Mobiles/Guards/Types/FactionHenchman.cs @@ -6,7 +6,7 @@ namespace Server.Factions { public class FactionHenchman : BaseFactionGuard { - public override GuardAI GuardAI{ get{ return GuardAI.Melee; } } + public override GuardAI GuardAI => GuardAI.Melee; [Constructible] public FactionHenchman() : base( "the henchman" ) @@ -64,4 +64,4 @@ namespace Server.Factions int version = reader.ReadInt(); } } -} \ No newline at end of file +} diff --git a/Scripts/Engines/Factions/Mobiles/Guards/Types/FactionKnight.cs b/Scripts/Engines/Factions/Mobiles/Guards/Types/FactionKnight.cs index a938088c9..2adba7ece 100644 --- a/Scripts/Engines/Factions/Mobiles/Guards/Types/FactionKnight.cs +++ b/Scripts/Engines/Factions/Mobiles/Guards/Types/FactionKnight.cs @@ -6,7 +6,7 @@ namespace Server.Factions { public class FactionKnight : BaseFactionGuard { - public override GuardAI GuardAI{ get{ return GuardAI.Magic | GuardAI.Melee | GuardAI.Smart | GuardAI.Curse | GuardAI.Bless; } } + public override GuardAI GuardAI => GuardAI.Magic | GuardAI.Melee | GuardAI.Smart | GuardAI.Curse | GuardAI.Bless; [Constructible] public FactionKnight() : base( "the knight" ) @@ -72,4 +72,4 @@ namespace Server.Factions int version = reader.ReadInt(); } } -} \ No newline at end of file +} diff --git a/Scripts/Engines/Factions/Mobiles/Guards/Types/FactionMercenary.cs b/Scripts/Engines/Factions/Mobiles/Guards/Types/FactionMercenary.cs index 27fd13775..be46c9b03 100644 --- a/Scripts/Engines/Factions/Mobiles/Guards/Types/FactionMercenary.cs +++ b/Scripts/Engines/Factions/Mobiles/Guards/Types/FactionMercenary.cs @@ -6,7 +6,7 @@ namespace Server.Factions { public class FactionMercenary : BaseFactionGuard { - public override GuardAI GuardAI{ get{ return GuardAI.Melee | GuardAI.Smart; } } + public override GuardAI GuardAI => GuardAI.Melee | GuardAI.Smart; [Constructible] public FactionMercenary() : base( "the mercenary" ) @@ -62,4 +62,4 @@ namespace Server.Factions int version = reader.ReadInt(); } } -} \ No newline at end of file +} diff --git a/Scripts/Engines/Factions/Mobiles/Guards/Types/FactionNecromancer.cs b/Scripts/Engines/Factions/Mobiles/Guards/Types/FactionNecromancer.cs index 028ea5a37..934517221 100644 --- a/Scripts/Engines/Factions/Mobiles/Guards/Types/FactionNecromancer.cs +++ b/Scripts/Engines/Factions/Mobiles/Guards/Types/FactionNecromancer.cs @@ -6,7 +6,7 @@ namespace Server.Factions { public class FactionNecromancer : BaseFactionGuard { - public override GuardAI GuardAI{ get{ return GuardAI.Magic | GuardAI.Smart | GuardAI.Bless | GuardAI.Curse; } } + public override GuardAI GuardAI => GuardAI.Magic | GuardAI.Smart | GuardAI.Bless | GuardAI.Curse; [Constructible] public FactionNecromancer() : base( "the necromancer" ) @@ -65,4 +65,4 @@ namespace Server.Factions int version = reader.ReadInt(); } } -} \ No newline at end of file +} diff --git a/Scripts/Engines/Factions/Mobiles/Guards/Types/FactionPaladin.cs b/Scripts/Engines/Factions/Mobiles/Guards/Types/FactionPaladin.cs index 531c10c1d..c3940aae1 100644 --- a/Scripts/Engines/Factions/Mobiles/Guards/Types/FactionPaladin.cs +++ b/Scripts/Engines/Factions/Mobiles/Guards/Types/FactionPaladin.cs @@ -7,7 +7,7 @@ namespace Server.Factions { public class FactionPaladin : BaseFactionGuard { - public override GuardAI GuardAI{ get{ return GuardAI.Magic | GuardAI.Melee | GuardAI.Smart | GuardAI.Curse | GuardAI.Bless; } } + public override GuardAI GuardAI => GuardAI.Magic | GuardAI.Melee | GuardAI.Smart | GuardAI.Curse | GuardAI.Bless; [Constructible] public FactionPaladin() : base( "the paladin" ) @@ -73,4 +73,4 @@ namespace Server.Factions int version = reader.ReadInt(); } } -} \ No newline at end of file +} diff --git a/Scripts/Engines/Factions/Mobiles/Guards/Types/FactionSorceress.cs b/Scripts/Engines/Factions/Mobiles/Guards/Types/FactionSorceress.cs index 5e94c748f..463684489 100644 --- a/Scripts/Engines/Factions/Mobiles/Guards/Types/FactionSorceress.cs +++ b/Scripts/Engines/Factions/Mobiles/Guards/Types/FactionSorceress.cs @@ -6,7 +6,7 @@ namespace Server.Factions { public class FactionSorceress : BaseFactionGuard { - public override GuardAI GuardAI{ get{ return GuardAI.Magic | GuardAI.Bless | GuardAI.Curse; } } + public override GuardAI GuardAI => GuardAI.Magic | GuardAI.Bless | GuardAI.Curse; [Constructible] public FactionSorceress() : base( "the sorceress" ) @@ -69,4 +69,4 @@ namespace Server.Factions int version = reader.ReadInt(); } } -} \ No newline at end of file +} diff --git a/Scripts/Engines/Factions/Mobiles/Guards/Types/FactionWizard.cs b/Scripts/Engines/Factions/Mobiles/Guards/Types/FactionWizard.cs index 32e09c319..dfc799a47 100644 --- a/Scripts/Engines/Factions/Mobiles/Guards/Types/FactionWizard.cs +++ b/Scripts/Engines/Factions/Mobiles/Guards/Types/FactionWizard.cs @@ -6,7 +6,7 @@ namespace Server.Factions { public class FactionWizard : BaseFactionGuard { - public override GuardAI GuardAI{ get{ return GuardAI.Magic | GuardAI.Smart | GuardAI.Bless | GuardAI.Curse; } } + public override GuardAI GuardAI => GuardAI.Magic | GuardAI.Smart | GuardAI.Bless | GuardAI.Curse; [Constructible] public FactionWizard() : base( "the wizard" ) @@ -66,4 +66,4 @@ namespace Server.Factions int version = reader.ReadInt(); } } -} \ No newline at end of file +} diff --git a/Scripts/Engines/Factions/Mobiles/Vendors/FactionBoardVendor.cs b/Scripts/Engines/Factions/Mobiles/Vendors/FactionBoardVendor.cs index 2eb221dad..212b7f27b 100644 --- a/Scripts/Engines/Factions/Mobiles/Vendors/FactionBoardVendor.cs +++ b/Scripts/Engines/Factions/Mobiles/Vendors/FactionBoardVendor.cs @@ -54,8 +54,8 @@ namespace Server.Factions { } - public override IShopSellInfo SellInfo { get { return m_SellInfo; } } - public override List BuyInfo { get { return m_BuyInfo; } } + public override IShopSellInfo SellInfo => m_SellInfo; + public override List BuyInfo => m_BuyInfo; public class InternalBuyInfo : List { @@ -73,4 +73,4 @@ namespace Server.Factions } } } -} \ No newline at end of file +} diff --git a/Scripts/Engines/Factions/Mobiles/Vendors/FactionBottleVendor.cs b/Scripts/Engines/Factions/Mobiles/Vendors/FactionBottleVendor.cs index eccad0397..bdb61db19 100644 --- a/Scripts/Engines/Factions/Mobiles/Vendors/FactionBottleVendor.cs +++ b/Scripts/Engines/Factions/Mobiles/Vendors/FactionBottleVendor.cs @@ -59,8 +59,8 @@ namespace Server.Factions { } - public override IShopSellInfo SellInfo { get { return m_SellInfo; } } - public override List BuyInfo { get { return m_BuyInfo; } } + public override IShopSellInfo SellInfo => m_SellInfo; + public override List BuyInfo => m_BuyInfo; public class InternalBuyInfo : List { @@ -78,4 +78,4 @@ namespace Server.Factions } } } -} \ No newline at end of file +} diff --git a/Scripts/Engines/Factions/Mobiles/Vendors/FactionOreVendor.cs b/Scripts/Engines/Factions/Mobiles/Vendors/FactionOreVendor.cs index a9d67fa3e..779f981c2 100644 --- a/Scripts/Engines/Factions/Mobiles/Vendors/FactionOreVendor.cs +++ b/Scripts/Engines/Factions/Mobiles/Vendors/FactionOreVendor.cs @@ -57,8 +57,8 @@ namespace Server.Factions { } - public override IShopSellInfo SellInfo { get { return m_SellInfo; } } - public override List BuyInfo { get { return m_BuyInfo; } } + public override IShopSellInfo SellInfo => m_SellInfo; + public override List BuyInfo => m_BuyInfo; public class InternalBuyInfo : List { @@ -76,4 +76,4 @@ namespace Server.Factions } } } -} \ No newline at end of file +} diff --git a/Scripts/Engines/Factions/Mobiles/Vendors/FactionReagentVendor.cs b/Scripts/Engines/Factions/Mobiles/Vendors/FactionReagentVendor.cs index 31e85cd4b..f25bada39 100644 --- a/Scripts/Engines/Factions/Mobiles/Vendors/FactionReagentVendor.cs +++ b/Scripts/Engines/Factions/Mobiles/Vendors/FactionReagentVendor.cs @@ -64,8 +64,8 @@ namespace Server.Factions { } - public override IShopSellInfo SellInfo { get { return m_SellInfo; } } - public override List BuyInfo { get { return m_BuyInfo; } } + public override IShopSellInfo SellInfo => m_SellInfo; + public override List BuyInfo => m_BuyInfo; public class InternalBuyInfo : List { @@ -92,4 +92,4 @@ namespace Server.Factions } } } -} \ No newline at end of file +} diff --git a/Scripts/Engines/Harvest/Core/BonusHarvestResource.cs b/Scripts/Engines/Harvest/Core/BonusHarvestResource.cs index fc8e1a3a9..8f3e2065f 100644 --- a/Scripts/Engines/Harvest/Core/BonusHarvestResource.cs +++ b/Scripts/Engines/Harvest/Core/BonusHarvestResource.cs @@ -12,7 +12,7 @@ namespace Server.Engines.Harvest public double ReqSkill { get { return m_ReqSkill; } set { m_ReqSkill = value; } } public double Chance { get { return m_Chance; } set { m_Chance = value; } } - public TextDefinition SuccessMessage { get { return m_SuccessMessage; } } + public TextDefinition SuccessMessage => m_SuccessMessage; public void SendSuccessTo( Mobile m ) { @@ -28,4 +28,4 @@ namespace Server.Engines.Harvest m_SuccessMessage = message; } } -} \ No newline at end of file +} diff --git a/Scripts/Engines/Harvest/Core/HarvestDefinition.cs b/Scripts/Engines/Harvest/Core/HarvestDefinition.cs index 1a8c7e7df..86cc1e0df 100644 --- a/Scripts/Engines/Harvest/Core/HarvestDefinition.cs +++ b/Scripts/Engines/Harvest/Core/HarvestDefinition.cs @@ -77,15 +77,13 @@ namespace Server.Engines.Harvest x /= m_BankWidth; y /= m_BankHeight; - Dictionary banks = null; - m_BanksByMap.TryGetValue( map, out banks ); + m_BanksByMap.TryGetValue( map, out Dictionary banks ); if ( banks == null ) m_BanksByMap[map] = banks = new Dictionary(); Point2D key = new Point2D( x, y ); - HarvestBank bank = null; - banks.TryGetValue( key, out bank ); + banks.TryGetValue( key, out HarvestBank bank ); if ( bank == null ) banks[key] = bank = new HarvestBank( this, GetVeinAt( map, x, y ) ); @@ -176,4 +174,4 @@ namespace Server.Engines.Harvest } } } -} \ No newline at end of file +} diff --git a/Scripts/Engines/Harvest/Core/HarvestSystem.cs b/Scripts/Engines/Harvest/Core/HarvestSystem.cs index cc3e148c8..890447d35 100644 --- a/Scripts/Engines/Harvest/Core/HarvestSystem.cs +++ b/Scripts/Engines/Harvest/Core/HarvestSystem.cs @@ -11,7 +11,7 @@ namespace Server.Engines.Harvest { private List m_Definitions; - public List Definitions { get { return m_Definitions; } } + public List Definitions => m_Definitions; public HarvestSystem() { @@ -66,7 +66,7 @@ namespace Server.Engines.Harvest public virtual object GetLock( Mobile from, Item tool, HarvestDefinition def, object toHarvest ) { /* Here we prevent multiple harvesting. - * + * * Some options: * - 'return tool;' : This will allow the player to harvest more than once concurrently, but only if they use multiple tools. This seems to be as OSI. * - 'return GetType();' : This will disallow multiple harvesting of the same type. That is, we couldn't mine more than once concurrently, but we could be both mining and lumberjacking. @@ -114,7 +114,7 @@ namespace Server.Engines.Harvest OnBadHarvestTarget( from, tool, toHarvest ); return; } - + if ( !CheckRange( from, tool, def, map, loc, true ) ) return; else if ( !CheckResources( from, tool, def, map, loc, true ) ) @@ -503,4 +503,4 @@ namespace Server { } } -} \ No newline at end of file +} diff --git a/Scripts/Engines/Khaldun/Books/GrimmochJournal.cs b/Scripts/Engines/Khaldun/Books/GrimmochJournal.cs index 27ed9d753..d709979c0 100644 --- a/Scripts/Engines/Khaldun/Books/GrimmochJournal.cs +++ b/Scripts/Engines/Khaldun/Books/GrimmochJournal.cs @@ -65,7 +65,7 @@ namespace Server.Items ) ); - public override BookContent DefaultContent{ get{ return Content; } } + public override BookContent DefaultContent => Content; [Constructible] public GrimmochJournal1() : base( Utility.Random( 0xFF1, 2 ), false ) @@ -172,7 +172,7 @@ namespace Server.Items ) ); - public override BookContent DefaultContent{ get{ return Content; } } + public override BookContent DefaultContent => Content; [Constructible] public GrimmochJournal2() : base( Utility.Random( 0xFF1, 2 ), false ) @@ -276,7 +276,7 @@ namespace Server.Items ) ); - public override BookContent DefaultContent{ get{ return Content; } } + public override BookContent DefaultContent => Content; [Constructible] public GrimmochJournal3() : base( Utility.Random( 0xFF1, 2 ), false ) @@ -375,7 +375,7 @@ namespace Server.Items ) ); - public override BookContent DefaultContent{ get{ return Content; } } + public override BookContent DefaultContent => Content; [Constructible] public GrimmochJournal6() : base( Utility.Random( 0xFF1, 2 ), false ) @@ -462,7 +462,7 @@ namespace Server.Items ) ); - public override BookContent DefaultContent{ get{ return Content; } } + public override BookContent DefaultContent => Content; [Constructible] public GrimmochJournal7() : base( Utility.Random( 0xFF1, 2 ), false ) @@ -532,7 +532,7 @@ namespace Server.Items ) ); - public override BookContent DefaultContent{ get{ return Content; } } + public override BookContent DefaultContent => Content; [Constructible] public GrimmochJournal11() : base( Utility.Random( 0xFF1, 2 ), false ) @@ -619,7 +619,7 @@ namespace Server.Items ) ); - public override BookContent DefaultContent{ get{ return Content; } } + public override BookContent DefaultContent => Content; [Constructible] public GrimmochJournal14() : base( Utility.Random( 0xFF1, 2 ), false ) @@ -711,7 +711,7 @@ namespace Server.Items ) ); - public override BookContent DefaultContent{ get{ return Content; } } + public override BookContent DefaultContent => Content; [Constructible] public GrimmochJournal17() : base( Utility.Random( 0xFF1, 2 ), false ) @@ -751,7 +751,7 @@ namespace Server.Items ) ); - public override BookContent DefaultContent{ get{ return Content; } } + public override BookContent DefaultContent => Content; [Constructible] public GrimmochJournal23() : base( Utility.Random( 0xFF1, 2 ), false ) @@ -776,4 +776,4 @@ namespace Server.Items int version = reader.ReadEncodedInt(); } } -} \ No newline at end of file +} diff --git a/Scripts/Engines/Khaldun/Books/LysanderNotebook.cs b/Scripts/Engines/Khaldun/Books/LysanderNotebook.cs index 7fb6abe91..8bad51118 100644 --- a/Scripts/Engines/Khaldun/Books/LysanderNotebook.cs +++ b/Scripts/Engines/Khaldun/Books/LysanderNotebook.cs @@ -36,7 +36,7 @@ namespace Server.Items ) ); - public override BookContent DefaultContent{ get{ return Content; } } + public override BookContent DefaultContent => Content; [Constructible] public LysanderNotebook1() : base( Utility.Random( 0xFF1, 2 ), false ) @@ -131,7 +131,7 @@ namespace Server.Items ) ); - public override BookContent DefaultContent{ get{ return Content; } } + public override BookContent DefaultContent => Content; [Constructible] public LysanderNotebook2() : base( Utility.Random( 0xFF1, 2 ), false ) @@ -219,7 +219,7 @@ namespace Server.Items ) ); - public override BookContent DefaultContent{ get{ return Content; } } + public override BookContent DefaultContent => Content; [Constructible] public LysanderNotebook3() : base( Utility.Random( 0xFF1, 2 ), false ) @@ -324,7 +324,7 @@ namespace Server.Items ) ); - public override BookContent DefaultContent{ get{ return Content; } } + public override BookContent DefaultContent => Content; [Constructible] public LysanderNotebook7() : base( Utility.Random( 0xFF1, 2 ), false ) @@ -419,7 +419,7 @@ namespace Server.Items ) ); - public override BookContent DefaultContent{ get{ return Content; } } + public override BookContent DefaultContent => Content; [Constructible] public LysanderNotebook8() : base( Utility.Random( 0xFF1, 2 ), false ) @@ -511,7 +511,7 @@ namespace Server.Items ) ); - public override BookContent DefaultContent{ get{ return Content; } } + public override BookContent DefaultContent => Content; [Constructible] public LysanderNotebook11() : base( Utility.Random( 0xFF1, 2 ), false ) @@ -536,4 +536,4 @@ namespace Server.Items int version = reader.ReadEncodedInt(); } } -} \ No newline at end of file +} diff --git a/Scripts/Engines/Khaldun/Books/TavarasJournal.cs b/Scripts/Engines/Khaldun/Books/TavarasJournal.cs index 3293fe24d..37a524dee 100644 --- a/Scripts/Engines/Khaldun/Books/TavarasJournal.cs +++ b/Scripts/Engines/Khaldun/Books/TavarasJournal.cs @@ -70,7 +70,7 @@ namespace Server.Items ) ); - public override BookContent DefaultContent{ get{ return Content; } } + public override BookContent DefaultContent => Content; [Constructible] public TavarasJournal1() : base( Utility.Random( 0xFF1, 2 ), false ) @@ -199,7 +199,7 @@ namespace Server.Items ) ); - public override BookContent DefaultContent{ get{ return Content; } } + public override BookContent DefaultContent => Content; [Constructible] public TavarasJournal2() : base( Utility.Random( 0xFF1, 2 ), false ) @@ -296,7 +296,7 @@ namespace Server.Items ) ); - public override BookContent DefaultContent{ get{ return Content; } } + public override BookContent DefaultContent => Content; [Constructible] public TavarasJournal3() : base( Utility.Random( 0xFF1, 2 ), false ) @@ -406,7 +406,7 @@ namespace Server.Items ) ); - public override BookContent DefaultContent{ get{ return Content; } } + public override BookContent DefaultContent => Content; [Constructible] public TavarasJournal6() : base( Utility.Random( 0xFF1, 2 ), false ) @@ -504,7 +504,7 @@ namespace Server.Items ) ); - public override BookContent DefaultContent{ get{ return Content; } } + public override BookContent DefaultContent => Content; [Constructible] public TavarasJournal7() : base( Utility.Random( 0xFF1, 2 ), false ) @@ -622,7 +622,7 @@ namespace Server.Items ) ); - public override BookContent DefaultContent{ get{ return Content; } } + public override BookContent DefaultContent => Content; [Constructible] public TavarasJournal8() : base( Utility.Random( 0xFF1, 2 ), false ) @@ -716,7 +716,7 @@ namespace Server.Items ) ); - public override BookContent DefaultContent{ get{ return Content; } } + public override BookContent DefaultContent => Content; [Constructible] public TavarasJournal9() : base( Utility.Random( 0xFF1, 2 ), false ) @@ -834,7 +834,7 @@ namespace Server.Items ) ); - public override BookContent DefaultContent{ get{ return Content; } } + public override BookContent DefaultContent => Content; [Constructible] public TavarasJournal11() : base( Utility.Random( 0xFF1, 2 ), false ) @@ -943,7 +943,7 @@ namespace Server.Items ) ); - public override BookContent DefaultContent{ get{ return Content; } } + public override BookContent DefaultContent => Content; [Constructible] public TavarasJournal14() : base( Utility.Random( 0xFF1, 2 ), false ) @@ -1064,7 +1064,7 @@ namespace Server.Items ) ); - public override BookContent DefaultContent{ get{ return Content; } } + public override BookContent DefaultContent => Content; [Constructible] public TavarasJournal16() : base( Utility.Random( 0xFF1, 2 ), false ) @@ -1174,7 +1174,7 @@ namespace Server.Items ) ); - public override BookContent DefaultContent{ get{ return Content; } } + public override BookContent DefaultContent => Content; [Constructible] public TavarasJournal16b() : base( Utility.Random( 0xFF1, 2 ), false ) @@ -1245,7 +1245,7 @@ namespace Server.Items ) ); - public override BookContent DefaultContent{ get{ return Content; } } + public override BookContent DefaultContent => Content; [Constructible] public TavarasJournal17() : base( Utility.Random( 0xFF1, 2 ), false ) @@ -1305,7 +1305,7 @@ namespace Server.Items ) ); - public override BookContent DefaultContent{ get{ return Content; } } + public override BookContent DefaultContent => Content; [Constructible] public TavarasJournal19() : base( Utility.Random( 0xFF1, 2 ), false ) @@ -1330,4 +1330,4 @@ namespace Server.Items int version = reader.ReadEncodedInt(); } } -} \ No newline at end of file +} diff --git a/Scripts/Engines/Khaldun/KhaldunPitTeleporter.cs b/Scripts/Engines/Khaldun/KhaldunPitTeleporter.cs index d313fdec5..b2a7c2dc3 100644 --- a/Scripts/Engines/Khaldun/KhaldunPitTeleporter.cs +++ b/Scripts/Engines/Khaldun/KhaldunPitTeleporter.cs @@ -29,7 +29,7 @@ namespace Server.Items set { m_MapDest = value; } } - public override int LabelNumber{ get{ return 1016511; } } // the floor of the cavern seems to have collapsed here - a faint light is visible at the bottom of the pit + public override int LabelNumber => 1016511; // the floor of the cavern seems to have collapsed here - a faint light is visible at the bottom of the pit [Constructible] public KhaldunPitTeleporter() : this( new Point3D( 5451, 1374, 0 ), Map.Felucca ) @@ -105,4 +105,4 @@ namespace Server.Items m_MapDest = reader.ReadMap(); } } -} \ No newline at end of file +} diff --git a/Scripts/Engines/Khaldun/PuzzleChest.cs b/Scripts/Engines/Khaldun/PuzzleChest.cs index 116c3f684..c2ebc0e4c 100644 --- a/Scripts/Engines/Khaldun/PuzzleChest.cs +++ b/Scripts/Engines/Khaldun/PuzzleChest.cs @@ -215,7 +215,7 @@ namespace Server.Items list.Add( Solution.Cylinders[i] ); m_Hints = new PuzzleChestCylinder[HintsCount]; - + for ( int i = 0; i < m_Hints.Length; i++ ) { int pos = Utility.Random( list.Count ); m_Hints[i] = list[pos]; @@ -252,8 +252,7 @@ namespace Server.Items public PuzzleChestSolutionAndTime GetLastGuess( Mobile m ) { - PuzzleChestSolutionAndTime pcst = null; - m_Guesses.TryGetValue( m, out pcst ); + m_Guesses.TryGetValue( m, out PuzzleChestSolutionAndTime pcst ); return pcst; } diff --git a/Scripts/Engines/MLQuests/Definitions/AGhostOfCovetous.cs b/Scripts/Engines/MLQuests/Definitions/AGhostOfCovetous.cs index ee32201f2..6032dab59 100644 Binary files a/Scripts/Engines/MLQuests/Definitions/AGhostOfCovetous.cs and b/Scripts/Engines/MLQuests/Definitions/AGhostOfCovetous.cs differ diff --git a/Scripts/Engines/MLQuests/Definitions/BaseEscort.cs b/Scripts/Engines/MLQuests/Definitions/BaseEscort.cs index ee9e989bf..162fd12f2 100644 --- a/Scripts/Engines/MLQuests/Definitions/BaseEscort.cs +++ b/Scripts/Engines/MLQuests/Definitions/BaseEscort.cs @@ -6,7 +6,7 @@ namespace Server.Engines.MLQuests.Definitions // Base class for escorts providing the AwardHumanInNeed option public class BaseEscort : MLQuest { - public virtual bool AwardHumanInNeed { get { return true; } } + public virtual bool AwardHumanInNeed => true; public BaseEscort() { diff --git a/Scripts/Engines/MLQuests/Definitions/BlightedGrove.cs b/Scripts/Engines/MLQuests/Definitions/BlightedGrove.cs index 9b4e24bb1..d0ea8dcd0 100644 --- a/Scripts/Engines/MLQuests/Definitions/BlightedGrove.cs +++ b/Scripts/Engines/MLQuests/Definitions/BlightedGrove.cs @@ -12,7 +12,7 @@ namespace Server.Engines.MLQuests.Definitions public class VilePoison : MLQuest { - public override Type NextQuest { get { return typeof( ARockAndAHardPlace ); } } + public override Type NextQuest => typeof( ARockAndAHardPlace ); public VilePoison() { @@ -42,7 +42,7 @@ namespace Server.Engines.MLQuests.Definitions public class ARockAndAHardPlace : MLQuest { - public override Type NextQuest { get { return typeof( SympatheticMagic ); } } + public override Type NextQuest => typeof( SympatheticMagic ); public override bool IsChainTriggered => true; public ARockAndAHardPlace() @@ -64,7 +64,7 @@ namespace Server.Engines.MLQuests.Definitions public class SympatheticMagic : MLQuest { - public override Type NextQuest { get { return typeof( AlreadyDead ); } } + public override Type NextQuest => typeof( AlreadyDead ); public override bool IsChainTriggered => true; public SympatheticMagic() @@ -84,7 +84,7 @@ namespace Server.Engines.MLQuests.Definitions public class AlreadyDead : MLQuest { - public override Type NextQuest { get { return typeof( Eureka ); } } + public override Type NextQuest => typeof( Eureka ); public override bool IsChainTriggered => true; public AlreadyDead() @@ -114,7 +114,7 @@ namespace Server.Engines.MLQuests.Definitions public class Eureka : MLQuest { - public override Type NextQuest { get { return typeof( SubContracting ); } } + public override Type NextQuest => typeof( SubContracting ); public override bool IsChainTriggered => true; public Eureka() diff --git a/Scripts/Engines/MLQuests/Definitions/Britannia.cs b/Scripts/Engines/MLQuests/Definitions/Britannia.cs index 8086a80bf..1e7d515a1 100644 --- a/Scripts/Engines/MLQuests/Definitions/Britannia.cs +++ b/Scripts/Engines/MLQuests/Definitions/Britannia.cs @@ -14,7 +14,7 @@ namespace Server.Engines.MLQuests.Definitions public class Aemaeth1 : MLQuest { - public override Type NextQuest { get { return typeof( Aemaeth2 ); } } + public override Type NextQuest => typeof( Aemaeth2 ); public Aemaeth1() { diff --git a/Scripts/Engines/MLQuests/Definitions/HonestBeggar.cs b/Scripts/Engines/MLQuests/Definitions/HonestBeggar.cs index 4921dc9fb..1f283d6d1 100644 --- a/Scripts/Engines/MLQuests/Definitions/HonestBeggar.cs +++ b/Scripts/Engines/MLQuests/Definitions/HonestBeggar.cs @@ -14,7 +14,7 @@ namespace Server.Engines.MLQuests.Definitions public class HonestBeggar : MLQuest { - public override Type NextQuest { get { return typeof( ReginasThanks ); } } + public override Type NextQuest => typeof( ReginasThanks ); public HonestBeggar() { diff --git a/Scripts/Engines/MLQuests/Definitions/LostItems.cs b/Scripts/Engines/MLQuests/Definitions/LostItems.cs index c74d056d3..3233723f8 100644 --- a/Scripts/Engines/MLQuests/Definitions/LostItems.cs +++ b/Scripts/Engines/MLQuests/Definitions/LostItems.cs @@ -35,9 +35,9 @@ namespace Server.Engines.MLQuests.Definitions public class BatteredBucket : TransientQuestGiverItem { // Original label, doesn't fit the expiration message well - //public override int LabelNumber { get { return 1073129; } } // A battered bucket. + //public override int LabelNumber => 1073129; // A battered bucket. - public override string DefaultName { get { return "battered bucket"; } } + public override string DefaultName => "battered bucket"; [Constructible] public BatteredBucket() diff --git a/Scripts/Engines/MLQuests/Definitions/MistakenIdentity.cs b/Scripts/Engines/MLQuests/Definitions/MistakenIdentity.cs index 41fad4b31..9d6c8fede 100644 --- a/Scripts/Engines/MLQuests/Definitions/MistakenIdentity.cs +++ b/Scripts/Engines/MLQuests/Definitions/MistakenIdentity.cs @@ -15,7 +15,7 @@ namespace Server.Engines.MLQuests.Definitions public class MistakenIdentity : MLQuest { - public override Type NextQuest { get { return typeof( YouScratchMyBack ); } } + public override Type NextQuest => typeof( YouScratchMyBack ); public MistakenIdentity() { @@ -42,7 +42,7 @@ namespace Server.Engines.MLQuests.Definitions public class YouScratchMyBack : MLQuest { - public override Type NextQuest { get { return typeof( FoolingAernya ); } } + public override Type NextQuest => typeof( FoolingAernya ); public override bool IsChainTriggered => true; public YouScratchMyBack() @@ -72,7 +72,7 @@ namespace Server.Engines.MLQuests.Definitions public class FoolingAernya : MLQuest { - public override Type NextQuest { get { return typeof( NotQuiteThatEasy ); } } + public override Type NextQuest => typeof( NotQuiteThatEasy ); public override bool IsChainTriggered => true; public FoolingAernya() @@ -93,7 +93,7 @@ namespace Server.Engines.MLQuests.Definitions public class NotQuiteThatEasy : MLQuest { - public override Type NextQuest { get { return typeof( ConvinceMe ); } } + public override Type NextQuest => typeof( ConvinceMe ); public override bool IsChainTriggered => true; public NotQuiteThatEasy() @@ -126,7 +126,7 @@ namespace Server.Engines.MLQuests.Definitions public class ConvinceMe : MLQuest { - public override Type NextQuest { get { return typeof( TuitionReimbursement ); } } + public override Type NextQuest => typeof( TuitionReimbursement ); public override bool IsChainTriggered => true; public ConvinceMe() diff --git a/Scripts/Engines/MLQuests/Definitions/NewHavenSkillTraining.cs b/Scripts/Engines/MLQuests/Definitions/NewHavenSkillTraining.cs index ed2d0a5d7..214023eac 100644 --- a/Scripts/Engines/MLQuests/Definitions/NewHavenSkillTraining.cs +++ b/Scripts/Engines/MLQuests/Definitions/NewHavenSkillTraining.cs @@ -1383,7 +1383,7 @@ namespace Server.Engines.MLQuests.Definitions public class GustarShroud : BaseOuterTorso { - public override string DefaultName{ get{ return " "; } } + public override string DefaultName => " "; [Constructible] public GustarShroud() : base( 0x2684 ) { diff --git a/Scripts/Engines/MLQuests/Definitions/Sanctuary.cs b/Scripts/Engines/MLQuests/Definitions/Sanctuary.cs index bf3babc24..d4387143c 100644 --- a/Scripts/Engines/MLQuests/Definitions/Sanctuary.cs +++ b/Scripts/Engines/MLQuests/Definitions/Sanctuary.cs @@ -393,7 +393,7 @@ namespace Server.Engines.MLQuests.Definitions public class MougGuurMustDie : MLQuest { - public override Type NextQuest { get { return typeof( LeaderOfThePack ); } } + public override Type NextQuest => typeof( LeaderOfThePack ); public MougGuurMustDie() { @@ -412,7 +412,7 @@ namespace Server.Engines.MLQuests.Definitions public class LeaderOfThePack : MLQuest { - public override Type NextQuest { get { return typeof( SayonaraSzavetra ); } } + public override Type NextQuest => typeof( SayonaraSzavetra ); public override bool IsChainTriggered => true; public LeaderOfThePack() @@ -522,7 +522,7 @@ namespace Server.Engines.MLQuests.Definitions public class Marauders : MLQuest { - public override Type NextQuest { get { return typeof( TheBrainsOfTheOperation ); } } + public override Type NextQuest => typeof( TheBrainsOfTheOperation ); public Marauders() { @@ -540,7 +540,7 @@ namespace Server.Engines.MLQuests.Definitions public class TheBrainsOfTheOperation : MLQuest { - public override Type NextQuest { get { return typeof( TheBrawn ); } } + public override Type NextQuest => typeof( TheBrawn ); public override bool IsChainTriggered => true; public TheBrainsOfTheOperation() @@ -559,7 +559,7 @@ namespace Server.Engines.MLQuests.Definitions public class TheBrawn : MLQuest { - public override Type NextQuest { get { return typeof( TheBiggerTheyAre ); } } + public override Type NextQuest => typeof( TheBiggerTheyAre ); public override bool IsChainTriggered => true; public TheBrawn() diff --git a/Scripts/Engines/MLQuests/Definitions/Spellweaving.cs b/Scripts/Engines/MLQuests/Definitions/Spellweaving.cs index 161ea7778..4afe12e6c 100644 --- a/Scripts/Engines/MLQuests/Definitions/Spellweaving.cs +++ b/Scripts/Engines/MLQuests/Definitions/Spellweaving.cs @@ -37,7 +37,7 @@ namespace Server.Engines.MLQuests.Definitions public class Patience : MLQuest { - public override Type NextQuest { get { return typeof( NeedsOfTheManyHeartwood1 ); } } + public override Type NextQuest => typeof( NeedsOfTheManyHeartwood1 ); public Patience() { @@ -74,7 +74,7 @@ namespace Server.Engines.MLQuests.Definitions public class NeedsOfTheManyHeartwood1 : MLQuest { - public override Type NextQuest { get { return typeof( NeedsOfTheManyHeartwood2 ); } } + public override Type NextQuest => typeof( NeedsOfTheManyHeartwood2 ); public override bool IsChainTriggered => true; public NeedsOfTheManyHeartwood1() @@ -94,7 +94,7 @@ namespace Server.Engines.MLQuests.Definitions public class NeedsOfTheManyHeartwood2 : MLQuest { - public override Type NextQuest { get { return typeof( MakingAContributionHeartwood ); } } + public override Type NextQuest => typeof( MakingAContributionHeartwood ); public override bool IsChainTriggered => true; public NeedsOfTheManyHeartwood2() @@ -114,7 +114,7 @@ namespace Server.Engines.MLQuests.Definitions public class MakingAContributionHeartwood : MLQuest { - public override Type NextQuest { get { return typeof( UnnaturalCreations ); } } + public override Type NextQuest => typeof( UnnaturalCreations ); public override bool IsChainTriggered => true; public MakingAContributionHeartwood() @@ -168,7 +168,7 @@ namespace Server.Engines.MLQuests.Definitions public class Discipline : MLQuest { - public override Type NextQuest { get { return typeof( NeedsOfTheManySanctuary ); } } + public override Type NextQuest => typeof( NeedsOfTheManySanctuary ); public Discipline() { @@ -195,7 +195,7 @@ namespace Server.Engines.MLQuests.Definitions public class NeedsOfTheManySanctuary : MLQuest { - public override Type NextQuest { get { return typeof( MakingAContributionSanctuary ); } } + public override Type NextQuest => typeof( MakingAContributionSanctuary ); public override bool IsChainTriggered => true; public NeedsOfTheManySanctuary() @@ -215,7 +215,7 @@ namespace Server.Engines.MLQuests.Definitions public class MakingAContributionSanctuary : MLQuest { - public override Type NextQuest { get { return typeof( SuppliesForSanctuary ); } } + public override Type NextQuest => typeof( SuppliesForSanctuary ); public override bool IsChainTriggered => true; public MakingAContributionSanctuary() @@ -235,7 +235,7 @@ namespace Server.Engines.MLQuests.Definitions public class SuppliesForSanctuary : MLQuest { - public override Type NextQuest { get { return typeof( TheHumanBlight ); } } + public override Type NextQuest => typeof( TheHumanBlight ); public override bool IsChainTriggered => true; public SuppliesForSanctuary() @@ -288,7 +288,7 @@ namespace Server.Engines.MLQuests.Definitions public class FriendOfTheFey : MLQuest { - public override Type NextQuest { get { return typeof( TokenOfFriendship ); } } + public override Type NextQuest => typeof( TokenOfFriendship ); public FriendOfTheFey() { @@ -316,7 +316,7 @@ namespace Server.Engines.MLQuests.Definitions public class TokenOfFriendship : MLQuest { - public override Type NextQuest { get { return typeof( Alliance ); } } + public override Type NextQuest => typeof( Alliance ); public override bool IsChainTriggered => true; public TokenOfFriendship() @@ -367,7 +367,7 @@ namespace Server.Engines.MLQuests.Definitions public class FiendishFriends : MLQuest { - public override Type NextQuest { get { return typeof( CrackingTheWhipI ); } } + public override Type NextQuest => typeof( CrackingTheWhipI ); public FiendishFriends() { @@ -396,7 +396,7 @@ namespace Server.Engines.MLQuests.Definitions // TODO: Verify public class CrackingTheWhipI : MLQuest { - public override Type NextQuest { get { return typeof( CrackingTheWhipII ); } } + public override Type NextQuest => typeof( CrackingTheWhipII ); public override bool IsChainTriggered => true; public CrackingTheWhipI() diff --git a/Scripts/Engines/MLQuests/Definitions/TheAncientWorld.cs b/Scripts/Engines/MLQuests/Definitions/TheAncientWorld.cs index 9418142c4..d4948b8ee 100644 --- a/Scripts/Engines/MLQuests/Definitions/TheAncientWorld.cs +++ b/Scripts/Engines/MLQuests/Definitions/TheAncientWorld.cs @@ -14,7 +14,7 @@ namespace Server.Engines.MLQuests.Definitions public class TheAncientWorld : MLQuest { - public override Type NextQuest { get { return typeof( TheGoldenHorn ); } } + public override Type NextQuest => typeof( TheGoldenHorn ); public TheAncientWorld() { @@ -41,7 +41,7 @@ namespace Server.Engines.MLQuests.Definitions public class TheGoldenHorn : MLQuest { - public override Type NextQuest { get { return typeof( Bullish ); } } + public override Type NextQuest => typeof( Bullish ); public override bool IsChainTriggered => true; public TheGoldenHorn() @@ -61,7 +61,7 @@ namespace Server.Engines.MLQuests.Definitions public class Bullish : MLQuest { - public override Type NextQuest { get { return typeof( LostCivilization ); } } + public override Type NextQuest => typeof( LostCivilization ); public override bool IsChainTriggered => true; public Bullish() diff --git a/Scripts/Engines/MLQuests/Definitions/UnfadingMemories.cs b/Scripts/Engines/MLQuests/Definitions/UnfadingMemories.cs index afa0a013e..8632c9fb4 100644 --- a/Scripts/Engines/MLQuests/Definitions/UnfadingMemories.cs +++ b/Scripts/Engines/MLQuests/Definitions/UnfadingMemories.cs @@ -14,7 +14,7 @@ namespace Server.Engines.MLQuests.Definitions public class UnfadingMemoriesPartOne : MLQuest { - public override Type NextQuest { get { return typeof( UnfadingMemoriesPartTwo ); } } + public override Type NextQuest => typeof( UnfadingMemoriesPartTwo ); public UnfadingMemoriesPartOne() { @@ -42,7 +42,7 @@ namespace Server.Engines.MLQuests.Definitions public class UnfadingMemoriesPartTwo : MLQuest { - public override Type NextQuest { get { return typeof( UnfadingMemoriesPartThree ); } } + public override Type NextQuest => typeof( UnfadingMemoriesPartThree ); public override bool IsChainTriggered => true; public UnfadingMemoriesPartTwo() diff --git a/Scripts/Engines/MLQuests/Definitions/WarriorsOfTheGemKeeper.cs b/Scripts/Engines/MLQuests/Definitions/WarriorsOfTheGemKeeper.cs index d1f77a751..77c0761c6 100644 --- a/Scripts/Engines/MLQuests/Definitions/WarriorsOfTheGemKeeper.cs +++ b/Scripts/Engines/MLQuests/Definitions/WarriorsOfTheGemKeeper.cs @@ -12,7 +12,7 @@ namespace Server.Engines.MLQuests.Definitions { public class WarriorsOfTheGemkeeper : MLQuest { - public override Type NextQuest { get { return typeof( CloseEnough ); } } + public override Type NextQuest => typeof( CloseEnough ); public WarriorsOfTheGemkeeper() { @@ -31,7 +31,7 @@ namespace Server.Engines.MLQuests.Definitions public class CloseEnough : MLQuest { - public override Type NextQuest { get { return typeof( TakingTheBullByTheHorns ); } } + public override Type NextQuest => typeof( TakingTheBullByTheHorns ); public override bool IsChainTriggered => true; public CloseEnough() @@ -51,7 +51,7 @@ namespace Server.Engines.MLQuests.Definitions public class TakingTheBullByTheHorns : MLQuest { - public override Type NextQuest { get { return typeof( EmissaryToTheMinotaur ); } } + public override Type NextQuest => typeof( EmissaryToTheMinotaur ); public override bool IsChainTriggered => true; public TakingTheBullByTheHorns() diff --git a/Scripts/Engines/MLQuests/Gumps/BaseQuestGump.cs b/Scripts/Engines/MLQuests/Gumps/BaseQuestGump.cs index 026c09560..b932309f8 100644 --- a/Scripts/Engines/MLQuests/Gumps/BaseQuestGump.cs +++ b/Scripts/Engines/MLQuests/Gumps/BaseQuestGump.cs @@ -36,9 +36,9 @@ namespace Server.Engines.MLQuests.Gumps private ButtonGraphic m_Graphic; private int m_ButtonID; - public ButtonPosition Position { get { return m_Position; } } - public ButtonGraphic Graphic { get { return m_Graphic; } } - public int ButtonID { get { return m_ButtonID; } } + public ButtonPosition Position => m_Position; + public ButtonGraphic Graphic => m_Graphic; + public int ButtonID => m_ButtonID; public ButtonInfo( ButtonPosition position, ButtonGraphic graphic, int buttonID ) { diff --git a/Scripts/Engines/MLQuests/Gumps/RaceChangeGump.cs b/Scripts/Engines/MLQuests/Gumps/RaceChangeGump.cs index aa69ec5c7..eded18974 100644 --- a/Scripts/Engines/MLQuests/Gumps/RaceChangeGump.cs +++ b/Scripts/Engines/MLQuests/Gumps/RaceChangeGump.cs @@ -117,9 +117,7 @@ namespace Server.Engines.MLQuests.Gumps private static void CloseCurrent( NetState ns ) { - RaceChangeState state; - - if ( m_Pending.TryGetValue( ns, out state ) ) + if (m_Pending.TryGetValue( ns, out RaceChangeState state )) { state.m_Timeout.Stop(); m_Pending.Remove( ns ); @@ -190,9 +188,7 @@ namespace Server.Engines.MLQuests.Gumps private static void RaceChangeReply( NetState state, PacketReader pvSrc ) { - RaceChangeState raceChangeState; - - if ( !m_Pending.TryGetValue( state, out raceChangeState ) ) + if (!m_Pending.TryGetValue( state, out RaceChangeState raceChangeState )) return; CloseCurrent( state ); @@ -289,7 +285,7 @@ namespace Server.Engines.MLQuests.Gumps public class RaceChangeDeed : Item, IRaceChanger { - public override string DefaultName { get { return "a race change deed"; } } + public override string DefaultName => "a race change deed"; [Constructible] public RaceChangeDeed() diff --git a/Scripts/Engines/MLQuests/Items/ABauble.cs b/Scripts/Engines/MLQuests/Items/ABauble.cs index 4a33fae78..a8a5a5c0c 100644 --- a/Scripts/Engines/MLQuests/Items/ABauble.cs +++ b/Scripts/Engines/MLQuests/Items/ABauble.cs @@ -5,7 +5,7 @@ namespace Server.Items { public class ABauble : Item { - public override int LabelNumber{ get{ return 1073137; } } // A bauble + public override int LabelNumber => 1073137; // A bauble [Constructible] public ABauble() : base( 0x23B ) diff --git a/Scripts/Engines/MLQuests/Items/APersonalLetterAddressedToAhie.cs b/Scripts/Engines/MLQuests/Items/APersonalLetterAddressedToAhie.cs index cb09af25d..62072cd71 100644 --- a/Scripts/Engines/MLQuests/Items/APersonalLetterAddressedToAhie.cs +++ b/Scripts/Engines/MLQuests/Items/APersonalLetterAddressedToAhie.cs @@ -5,7 +5,7 @@ namespace Server.Items { public class APersonalLetterAddressedToAhie : TransientItem { - public override int LabelNumber{ get{ return 1073128; } } // A personal letter addressed to: Ahie + public override int LabelNumber => 1073128; // A personal letter addressed to: Ahie public override bool Nontransferable => true; diff --git a/Scripts/Engines/MLQuests/Items/AlchemistsBandage.cs b/Scripts/Engines/MLQuests/Items/AlchemistsBandage.cs index e96a8c053..9299f116d 100644 --- a/Scripts/Engines/MLQuests/Items/AlchemistsBandage.cs +++ b/Scripts/Engines/MLQuests/Items/AlchemistsBandage.cs @@ -5,7 +5,7 @@ namespace Server.Items { public class AlchemistsBandage : Item { - public override int LabelNumber{ get{ return 1075452; } } // Alchemist's Bandage + public override int LabelNumber => 1075452; // Alchemist's Bandage public override bool Nontransferable => true; diff --git a/Scripts/Engines/MLQuests/Items/AnOldNecklace.cs b/Scripts/Engines/MLQuests/Items/AnOldNecklace.cs index 1bb32f716..a3ceb8acd 100644 --- a/Scripts/Engines/MLQuests/Items/AnOldNecklace.cs +++ b/Scripts/Engines/MLQuests/Items/AnOldNecklace.cs @@ -5,10 +5,10 @@ namespace Server.Items { public class AnOldNecklace : Necklace { - public override int LabelNumber{ get{ return 1075525; } } // an old necklace + public override int LabelNumber => 1075525; // an old necklace [Constructible] - public AnOldNecklace() : base() + public AnOldNecklace() { Hue = 0x222; } diff --git a/Scripts/Engines/MLQuests/Items/AnOldRing.cs b/Scripts/Engines/MLQuests/Items/AnOldRing.cs index 7069e4777..2972394c8 100644 --- a/Scripts/Engines/MLQuests/Items/AnOldRing.cs +++ b/Scripts/Engines/MLQuests/Items/AnOldRing.cs @@ -5,10 +5,10 @@ namespace Server.Items { public class AnOldRing : GoldRing { - public override int LabelNumber{ get{ return 1075524; } } // an old ring + public override int LabelNumber => 1075524; // an old ring [Constructible] - public AnOldRing() : base() + public AnOldRing() { Hue = 0x222; } diff --git a/Scripts/Engines/MLQuests/Items/AndrosGratitude.cs b/Scripts/Engines/MLQuests/Items/AndrosGratitude.cs index ea995ffac..d77a8ec4d 100644 --- a/Scripts/Engines/MLQuests/Items/AndrosGratitude.cs +++ b/Scripts/Engines/MLQuests/Items/AndrosGratitude.cs @@ -5,7 +5,7 @@ namespace Server.Items { public class AndrosGratitude : SmithHammer { - public override int LabelNumber{ get{ return 1075345; } } // Andros Gratitude + public override int LabelNumber => 1075345; // Andros Gratitude [Constructible] public AndrosGratitude() : base( 10 ) diff --git a/Scripts/Engines/MLQuests/Items/BasinOfCrystalClearWater.cs b/Scripts/Engines/MLQuests/Items/BasinOfCrystalClearWater.cs index 2bf7e0c77..e01fa4a4e 100644 --- a/Scripts/Engines/MLQuests/Items/BasinOfCrystalClearWater.cs +++ b/Scripts/Engines/MLQuests/Items/BasinOfCrystalClearWater.cs @@ -5,7 +5,7 @@ namespace Server.Items { public class BasinOfCrystalClearWater : Item { - public override int LabelNumber{ get{ return 1075303; } } // Basin of Crystal-Clear Water + public override int LabelNumber => 1075303; // Basin of Crystal-Clear Water public override bool Nontransferable => true; diff --git a/Scripts/Engines/MLQuests/Items/BedlamTeleporter.cs b/Scripts/Engines/MLQuests/Items/BedlamTeleporter.cs index 80e3e7df6..0d9f5140c 100644 --- a/Scripts/Engines/MLQuests/Items/BedlamTeleporter.cs +++ b/Scripts/Engines/MLQuests/Items/BedlamTeleporter.cs @@ -8,7 +8,7 @@ namespace Server.Engines.MLQuests.Items { public class BedlamTeleporter : Item { - public override int LabelNumber { get { return 1074161; } } // Access to Bedlam by invitation only + public override int LabelNumber => 1074161; // Access to Bedlam by invitation only private static readonly Point3D PointDest = new Point3D( 120, 1682, 0 ); private static readonly Map MapDest = Map.Malas; diff --git a/Scripts/Engines/MLQuests/Items/Bleach.cs b/Scripts/Engines/MLQuests/Items/Bleach.cs index f958deddf..e1e5874ca 100644 --- a/Scripts/Engines/MLQuests/Items/Bleach.cs +++ b/Scripts/Engines/MLQuests/Items/Bleach.cs @@ -5,7 +5,7 @@ namespace Server.Items { public class Bleach : PigmentsOfTokuno { - public override int LabelNumber { get { return 1075375; } } // Bleach + public override int LabelNumber => 1075375; // Bleach [Constructible] public Bleach() : base( PigmentType.None ) diff --git a/Scripts/Engines/MLQuests/Items/BridesLetter.cs b/Scripts/Engines/MLQuests/Items/BridesLetter.cs index 5c4424fe9..5a7fd8c12 100644 --- a/Scripts/Engines/MLQuests/Items/BridesLetter.cs +++ b/Scripts/Engines/MLQuests/Items/BridesLetter.cs @@ -5,7 +5,7 @@ namespace Server.Items { public class BridesLetter : Item { - public override int LabelNumber{ get{ return 1075301; } } // Bride's Letter + public override int LabelNumber => 1075301; // Bride's Letter public override bool Nontransferable => true; diff --git a/Scripts/Engines/MLQuests/Items/CompletedTuitionReimbursementForm.cs b/Scripts/Engines/MLQuests/Items/CompletedTuitionReimbursementForm.cs index 582bc2489..098afe678 100644 --- a/Scripts/Engines/MLQuests/Items/CompletedTuitionReimbursementForm.cs +++ b/Scripts/Engines/MLQuests/Items/CompletedTuitionReimbursementForm.cs @@ -5,7 +5,7 @@ namespace Server.Items { public class CompletedTuitionReimbursementForm : Item { - public override int LabelNumber{ get{ return 1074625; } } // Completed Tuition Reimbursement Form + public override int LabelNumber => 1074625; // Completed Tuition Reimbursement Form public override bool Nontransferable => true; diff --git a/Scripts/Engines/MLQuests/Items/CrateForSledge.cs b/Scripts/Engines/MLQuests/Items/CrateForSledge.cs index d23a2e0b7..ffd9a14ab 100644 --- a/Scripts/Engines/MLQuests/Items/CrateForSledge.cs +++ b/Scripts/Engines/MLQuests/Items/CrateForSledge.cs @@ -5,7 +5,7 @@ namespace Server.Items { public class CrateForSledge : TransientItem { - public override int LabelNumber{ get{ return 1074520; } } // Crate for Sledge + public override int LabelNumber => 1074520; // Crate for Sledge public override bool Nontransferable => true; diff --git a/Scripts/Engines/MLQuests/Items/DreadSpiderSilk.cs b/Scripts/Engines/MLQuests/Items/DreadSpiderSilk.cs index 372fa2f85..23042c677 100644 --- a/Scripts/Engines/MLQuests/Items/DreadSpiderSilk.cs +++ b/Scripts/Engines/MLQuests/Items/DreadSpiderSilk.cs @@ -5,7 +5,7 @@ namespace Server.Items { public class DreadSpiderSilk : Item { - public override int LabelNumber{ get{ return 1075319; } } // Dread Spider Silk + public override int LabelNumber => 1075319; // Dread Spider Silk public override bool Nontransferable => true; diff --git a/Scripts/Engines/MLQuests/Items/FragmentOfAMap.cs b/Scripts/Engines/MLQuests/Items/FragmentOfAMap.cs index 6293b3f8a..d5b1183c4 100644 --- a/Scripts/Engines/MLQuests/Items/FragmentOfAMap.cs +++ b/Scripts/Engines/MLQuests/Items/FragmentOfAMap.cs @@ -5,7 +5,7 @@ namespace Server.Items { public class FragmentOfAMap : Item { - public override int LabelNumber{ get{ return 1074533; } } // Fragment of a Map + public override int LabelNumber => 1074533; // Fragment of a Map [Constructible] public FragmentOfAMap() : base( 0x14ED ) diff --git a/Scripts/Engines/MLQuests/Items/FragmentOfAMapDelivery.cs b/Scripts/Engines/MLQuests/Items/FragmentOfAMapDelivery.cs index 98409d80d..a88cce8b3 100644 --- a/Scripts/Engines/MLQuests/Items/FragmentOfAMapDelivery.cs +++ b/Scripts/Engines/MLQuests/Items/FragmentOfAMapDelivery.cs @@ -5,7 +5,7 @@ namespace Server.Items { public class FragmentOfAMapDelivery : Item { - public override int LabelNumber{ get{ return 1074533; } } // Fragment of a Map + public override int LabelNumber => 1074533; // Fragment of a Map public override bool Nontransferable => true; diff --git a/Scripts/Engines/MLQuests/Items/FriendOfTheLibraryToken.cs b/Scripts/Engines/MLQuests/Items/FriendOfTheLibraryToken.cs index 572b36cf9..eb1c3322a 100644 --- a/Scripts/Engines/MLQuests/Items/FriendOfTheLibraryToken.cs +++ b/Scripts/Engines/MLQuests/Items/FriendOfTheLibraryToken.cs @@ -5,7 +5,7 @@ namespace Server.Items { public class FriendOfTheLibraryToken : Item { - public override int LabelNumber{ get{ return 1073136; } } // Friend of the Library Token (allows donations to be made) + public override int LabelNumber => 1073136; // Friend of the Library Token (allows donations to be made) [Constructible] public FriendOfTheLibraryToken() : base( 0x2F58 ) diff --git a/Scripts/Engines/MLQuests/Items/FriendsOfTheLibraryApplication.cs b/Scripts/Engines/MLQuests/Items/FriendsOfTheLibraryApplication.cs index a15b7c4c9..f9eaa5b0e 100644 --- a/Scripts/Engines/MLQuests/Items/FriendsOfTheLibraryApplication.cs +++ b/Scripts/Engines/MLQuests/Items/FriendsOfTheLibraryApplication.cs @@ -5,7 +5,7 @@ namespace Server.Items { public class FriendsOfTheLibraryApplication : Item { - public override int LabelNumber{ get{ return 1073131; } } // Friends of the Library Application + public override int LabelNumber => 1073131; // Friends of the Library Application public override bool Nontransferable => true; diff --git a/Scripts/Engines/MLQuests/Items/GamanHorns.cs b/Scripts/Engines/MLQuests/Items/GamanHorns.cs index c364c9e70..5955ccd69 100644 --- a/Scripts/Engines/MLQuests/Items/GamanHorns.cs +++ b/Scripts/Engines/MLQuests/Items/GamanHorns.cs @@ -5,7 +5,7 @@ namespace Server.Items { public class GamanHorns : Item { - public override int LabelNumber{ get{ return 1074557; } } // Gaman Horns + public override int LabelNumber => 1074557; // Gaman Horns [Constructible] public GamanHorns() : this( 1 ) diff --git a/Scripts/Engines/MLQuests/Items/GiftForArielle.cs b/Scripts/Engines/MLQuests/Items/GiftForArielle.cs index b00d0de8d..6ddfc7213 100644 --- a/Scripts/Engines/MLQuests/Items/GiftForArielle.cs +++ b/Scripts/Engines/MLQuests/Items/GiftForArielle.cs @@ -5,8 +5,8 @@ namespace Server.Items { public class GiftForArielle : BaseContainer { - public override int LabelNumber{ get{ return 1074356; } } // gift for arielle - public override int DefaultGumpID { get { return 0x41; } } + public override int LabelNumber => 1074356; // gift for arielle + public override int DefaultGumpID => 0x41; public override bool Nontransferable => true; diff --git a/Scripts/Engines/MLQuests/Items/KirinBrains.cs b/Scripts/Engines/MLQuests/Items/KirinBrains.cs index 88b09af0f..c347dcb08 100644 --- a/Scripts/Engines/MLQuests/Items/KirinBrains.cs +++ b/Scripts/Engines/MLQuests/Items/KirinBrains.cs @@ -5,7 +5,7 @@ namespace Server.Items { public class KirinBrains : Item { - public override int LabelNumber{ get{ return 1074612; } } // Ki-Rin Brains + public override int LabelNumber => 1074612; // Ki-Rin Brains [Constructible] public KirinBrains() : base( 0x1CF0 ) diff --git a/Scripts/Engines/MLQuests/Items/MiniatureMushroom.cs b/Scripts/Engines/MLQuests/Items/MiniatureMushroom.cs index a14949b06..15a1f133d 100644 --- a/Scripts/Engines/MLQuests/Items/MiniatureMushroom.cs +++ b/Scripts/Engines/MLQuests/Items/MiniatureMushroom.cs @@ -5,7 +5,7 @@ namespace Server.Items { public class MiniatureMushroom : Food { - public override int LabelNumber{ get{ return 1073138; } } // Miniature mushroom + public override int LabelNumber => 1073138; // Miniature mushroom [Constructible] public MiniatureMushroom() : base( 0xD16 ) diff --git a/Scripts/Engines/MLQuests/Items/MirrorOfPurification.cs b/Scripts/Engines/MLQuests/Items/MirrorOfPurification.cs index b3a563e8e..ab2c7cd64 100644 --- a/Scripts/Engines/MLQuests/Items/MirrorOfPurification.cs +++ b/Scripts/Engines/MLQuests/Items/MirrorOfPurification.cs @@ -5,7 +5,7 @@ namespace Server.Items { public class MirrorOfPurification : Item { - public override int LabelNumber{ get{ return 1075304; } } // Mirror of Purification + public override int LabelNumber => 1075304; // Mirror of Purification [Constructible] public MirrorOfPurification() : base( 0x1008 ) diff --git a/Scripts/Engines/MLQuests/Items/NotarizedApplication.cs b/Scripts/Engines/MLQuests/Items/NotarizedApplication.cs index 23b62f5cb..74e9a18a4 100644 --- a/Scripts/Engines/MLQuests/Items/NotarizedApplication.cs +++ b/Scripts/Engines/MLQuests/Items/NotarizedApplication.cs @@ -5,7 +5,7 @@ namespace Server.Items { public class NotarizedApplication : Item { - public override int LabelNumber{ get{ return 1073135; } } // Notarized Application + public override int LabelNumber => 1073135; // Notarized Application public override bool Nontransferable => true; diff --git a/Scripts/Engines/MLQuests/Items/OfficialSealingWax.cs b/Scripts/Engines/MLQuests/Items/OfficialSealingWax.cs index ae1df4966..56c5df2b5 100644 --- a/Scripts/Engines/MLQuests/Items/OfficialSealingWax.cs +++ b/Scripts/Engines/MLQuests/Items/OfficialSealingWax.cs @@ -5,7 +5,7 @@ namespace Server.Items { public class OfficialSealingWax : Item { - public override int LabelNumber{ get{ return 1072744; } } // Official Sealing Wax + public override int LabelNumber => 1072744; // Official Sealing Wax public override bool Nontransferable => true; diff --git a/Scripts/Engines/MLQuests/Items/PeppercornFishsteak.cs b/Scripts/Engines/MLQuests/Items/PeppercornFishsteak.cs index 4b14d605a..0b97b7576 100644 --- a/Scripts/Engines/MLQuests/Items/PeppercornFishsteak.cs +++ b/Scripts/Engines/MLQuests/Items/PeppercornFishsteak.cs @@ -5,10 +5,10 @@ namespace Server.Items { public class PeppercornFishsteak : FishSteak { - public override int LabelNumber{ get{ return 1075557; } } // peppercorn fishsteak + public override int LabelNumber => 1075557; // peppercorn fishsteak [Constructible] - public PeppercornFishsteak() : base() + public PeppercornFishsteak() { Hue = 0x222; } diff --git a/Scripts/Engines/MLQuests/Items/PixieLeg.cs b/Scripts/Engines/MLQuests/Items/PixieLeg.cs index 0bc09dd67..3d65f380f 100644 --- a/Scripts/Engines/MLQuests/Items/PixieLeg.cs +++ b/Scripts/Engines/MLQuests/Items/PixieLeg.cs @@ -5,7 +5,7 @@ namespace Server.Items { public class PixieLeg : ChickenLeg { - public override int LabelNumber{ get{ return 1074613; } } // Pixie Leg + public override int LabelNumber => 1074613; // Pixie Leg [Constructible] public PixieLeg() : this( 1 ) diff --git a/Scripts/Engines/MLQuests/Items/PortraitOfTheBride.cs b/Scripts/Engines/MLQuests/Items/PortraitOfTheBride.cs index d3ffa4b0b..e74db2ac6 100644 --- a/Scripts/Engines/MLQuests/Items/PortraitOfTheBride.cs +++ b/Scripts/Engines/MLQuests/Items/PortraitOfTheBride.cs @@ -5,7 +5,7 @@ namespace Server.Items { public class PortraitOfTheBride : Item { - public override int LabelNumber{ get{ return 1075300; } } // Portrait of the Bride + public override int LabelNumber => 1075300; // Portrait of the Bride public override bool Nontransferable => true; diff --git a/Scripts/Engines/MLQuests/Items/PrismaticAmber.cs b/Scripts/Engines/MLQuests/Items/PrismaticAmber.cs index 67173c1b6..e05062707 100644 --- a/Scripts/Engines/MLQuests/Items/PrismaticAmber.cs +++ b/Scripts/Engines/MLQuests/Items/PrismaticAmber.cs @@ -5,10 +5,10 @@ namespace Server.Items { public class PrismaticAmber : Amber { - public override int LabelNumber{ get{ return 1075299; } } // Prismatic Amber + public override int LabelNumber => 1075299; // Prismatic Amber [Constructible] - public PrismaticAmber() : base() + public PrismaticAmber() { } diff --git a/Scripts/Engines/MLQuests/Items/PrismaticCrystal.cs b/Scripts/Engines/MLQuests/Items/PrismaticCrystal.cs index 63f53f431..0f211dc3c 100644 --- a/Scripts/Engines/MLQuests/Items/PrismaticCrystal.cs +++ b/Scripts/Engines/MLQuests/Items/PrismaticCrystal.cs @@ -9,7 +9,7 @@ namespace Server.Items { public class PrismaticCrystal : Item { - public override int LabelNumber{ get{ return 1074269; } } // prismatic crystal + public override int LabelNumber => 1074269; // prismatic crystal [Constructible] public PrismaticCrystal() : base( 0x2DA ) diff --git a/Scripts/Engines/MLQuests/Items/ReginasLetter.cs b/Scripts/Engines/MLQuests/Items/ReginasLetter.cs index d01a972d4..a732f51dd 100644 --- a/Scripts/Engines/MLQuests/Items/ReginasLetter.cs +++ b/Scripts/Engines/MLQuests/Items/ReginasLetter.cs @@ -5,7 +5,7 @@ namespace Server.Items { public class ReginasLetter : Item { - public override int LabelNumber{ get{ return 1075306; } } // Regina's Letter + public override int LabelNumber => 1075306; // Regina's Letter public override bool Nontransferable => true; diff --git a/Scripts/Engines/MLQuests/Items/ReginasRing.cs b/Scripts/Engines/MLQuests/Items/ReginasRing.cs index c9d7b8f15..522b146dc 100644 --- a/Scripts/Engines/MLQuests/Items/ReginasRing.cs +++ b/Scripts/Engines/MLQuests/Items/ReginasRing.cs @@ -5,7 +5,7 @@ namespace Server.Items { public class ReginasRing : SilverRing { - public override int LabelNumber{ get{ return 1075305; } } // Regina's Ring + public override int LabelNumber => 1075305; // Regina's Ring public override bool Nontransferable => true; @@ -16,7 +16,7 @@ namespace Server.Items } [Constructible] - public ReginasRing() : base() + public ReginasRing() { LootType = LootType.Blessed; } diff --git a/Scripts/Engines/MLQuests/Items/SapOfSosaria.cs b/Scripts/Engines/MLQuests/Items/SapOfSosaria.cs index b76f5a87b..105298494 100644 --- a/Scripts/Engines/MLQuests/Items/SapOfSosaria.cs +++ b/Scripts/Engines/MLQuests/Items/SapOfSosaria.cs @@ -5,7 +5,7 @@ namespace Server.Items { public class SapOfSosaria : Item { - public override int LabelNumber{ get{ return 1074178; } } // Sap of Sosaria + public override int LabelNumber => 1074178; // Sap of Sosaria [Constructible] public SapOfSosaria() : this( 1 ) diff --git a/Scripts/Engines/MLQuests/Items/SealedNotesForJamal.cs b/Scripts/Engines/MLQuests/Items/SealedNotesForJamal.cs index e020061df..2a83bc6c0 100644 --- a/Scripts/Engines/MLQuests/Items/SealedNotesForJamal.cs +++ b/Scripts/Engines/MLQuests/Items/SealedNotesForJamal.cs @@ -5,8 +5,8 @@ namespace Server.Items { public class SealedNotesForJamal : Item { - public override int LabelNumber{ get{ return 1074998; } } // Sealed Notes For Jamal - public override double DefaultWeight{ get{ return 1.0; } } + public override int LabelNumber => 1074998; // Sealed Notes For Jamal + public override double DefaultWeight => 1.0; public override bool Nontransferable => true; diff --git a/Scripts/Engines/MLQuests/Items/SealingWaxOrderAddressedToPetrus.cs b/Scripts/Engines/MLQuests/Items/SealingWaxOrderAddressedToPetrus.cs index 0c3f85491..6ede54ad6 100644 --- a/Scripts/Engines/MLQuests/Items/SealingWaxOrderAddressedToPetrus.cs +++ b/Scripts/Engines/MLQuests/Items/SealingWaxOrderAddressedToPetrus.cs @@ -5,7 +5,7 @@ namespace Server.Items { public class SealingWaxOrderAddressedToPetrus : Item { - public override int LabelNumber{ get{ return 1073132; } } // Sealing Wax Order addressed to Petrus + public override int LabelNumber => 1073132; // Sealing Wax Order addressed to Petrus public override bool Nontransferable => true; diff --git a/Scripts/Engines/MLQuests/Items/SignedTuitionReimbursementForm.cs b/Scripts/Engines/MLQuests/Items/SignedTuitionReimbursementForm.cs index cdfceece6..1de111436 100644 --- a/Scripts/Engines/MLQuests/Items/SignedTuitionReimbursementForm.cs +++ b/Scripts/Engines/MLQuests/Items/SignedTuitionReimbursementForm.cs @@ -5,7 +5,7 @@ namespace Server.Items { public class SignedTuitionReimbursementForm : Item { - public override int LabelNumber{ get{ return 1074614; } } // Signed Tuition Reimbursement Form + public override int LabelNumber => 1074614; // Signed Tuition Reimbursement Form public override bool Nontransferable => true; diff --git a/Scripts/Engines/MLQuests/Items/SpecialTreatForDrithen.cs b/Scripts/Engines/MLQuests/Items/SpecialTreatForDrithen.cs index 25e3b786b..6a8ed21a1 100644 --- a/Scripts/Engines/MLQuests/Items/SpecialTreatForDrithen.cs +++ b/Scripts/Engines/MLQuests/Items/SpecialTreatForDrithen.cs @@ -5,7 +5,7 @@ namespace Server.Items { public class SpecialTreatForDrithen : Item { - public override int LabelNumber{ get{ return 1074517; } } // Special Treat for Drithen + public override int LabelNumber => 1074517; // Special Treat for Drithen [Constructible] public SpecialTreatForDrithen() : base( 0x21B ) diff --git a/Scripts/Engines/MLQuests/Items/SpeckledPoisonSac.cs b/Scripts/Engines/MLQuests/Items/SpeckledPoisonSac.cs index f2c01f81a..bdef07f94 100644 --- a/Scripts/Engines/MLQuests/Items/SpeckledPoisonSac.cs +++ b/Scripts/Engines/MLQuests/Items/SpeckledPoisonSac.cs @@ -5,7 +5,7 @@ namespace Server.Items { public class SpeckledPoisonSac : TransientItem { - public override int LabelNumber{ get{ return 1073133; } } // Speckled Poison Sac + public override int LabelNumber => 1073133; // Speckled Poison Sac [Constructible] public SpeckledPoisonSac() : base( 0x23A, TimeSpan.FromHours( 1 ) ) diff --git a/Scripts/Engines/MLQuests/Items/SpiritBottle.cs b/Scripts/Engines/MLQuests/Items/SpiritBottle.cs index b3c47f0dd..767b19c18 100644 --- a/Scripts/Engines/MLQuests/Items/SpiritBottle.cs +++ b/Scripts/Engines/MLQuests/Items/SpiritBottle.cs @@ -5,7 +5,7 @@ namespace Server.Items { public class SpiritBottle : Item { - public override int LabelNumber{ get{ return 1075283; } } // Spirit bottle + public override int LabelNumber => 1075283; // Spirit bottle public override bool Nontransferable => true; diff --git a/Scripts/Engines/MLQuests/Items/StoutWhip.cs b/Scripts/Engines/MLQuests/Items/StoutWhip.cs index 17ec29271..503e6fa50 100644 --- a/Scripts/Engines/MLQuests/Items/StoutWhip.cs +++ b/Scripts/Engines/MLQuests/Items/StoutWhip.cs @@ -5,7 +5,7 @@ namespace Server.Items { public class StoutWhip : Item { - public override int LabelNumber{ get{ return 1074812; } } // Stout Whip + public override int LabelNumber => 1074812; // Stout Whip [Constructible] public StoutWhip() : base( 0x166F ) diff --git a/Scripts/Engines/MLQuests/Items/TaintedTreeSample.cs b/Scripts/Engines/MLQuests/Items/TaintedTreeSample.cs index c48b6a8bc..255fd52de 100644 --- a/Scripts/Engines/MLQuests/Items/TaintedTreeSample.cs +++ b/Scripts/Engines/MLQuests/Items/TaintedTreeSample.cs @@ -5,7 +5,7 @@ namespace Server.Items { public class TaintedTreeSample : Item // On OSI the base class is Kindling, and it's ignitable... { - public override int LabelNumber{ get{ return 1074997; } } // Tainted Tree Sample + public override int LabelNumber => 1074997; // Tainted Tree Sample public override bool Nontransferable => true; diff --git a/Scripts/Engines/MLQuests/Items/TransparentHeart.cs b/Scripts/Engines/MLQuests/Items/TransparentHeart.cs index c5a982556..45326fe51 100644 --- a/Scripts/Engines/MLQuests/Items/TransparentHeart.cs +++ b/Scripts/Engines/MLQuests/Items/TransparentHeart.cs @@ -5,10 +5,10 @@ namespace Server.Items { public class TransparentHeart : GoldEarrings { - public override int LabelNumber{ get{ return 1075400; } } // Transparent Heart + public override int LabelNumber => 1075400; // Transparent Heart [Constructible] - public TransparentHeart() : base() + public TransparentHeart() { LootType = LootType.Blessed; Hue = 0x4AB; diff --git a/Scripts/Engines/MLQuests/Items/TuitionReimbursementForm.cs b/Scripts/Engines/MLQuests/Items/TuitionReimbursementForm.cs index cddd3c7c4..63f9d292d 100644 --- a/Scripts/Engines/MLQuests/Items/TuitionReimbursementForm.cs +++ b/Scripts/Engines/MLQuests/Items/TuitionReimbursementForm.cs @@ -5,7 +5,7 @@ namespace Server.Items { public class TuitionReimbursementForm : Item { - public override int LabelNumber{ get{ return 1074610; } } // Tuition Reimbursement Form (in triplicate) + public override int LabelNumber => 1074610; // Tuition Reimbursement Form (in triplicate) public override bool Nontransferable => true; diff --git a/Scripts/Engines/MLQuests/Items/UnicornRibs.cs b/Scripts/Engines/MLQuests/Items/UnicornRibs.cs index 831112f40..e336ccd25 100644 --- a/Scripts/Engines/MLQuests/Items/UnicornRibs.cs +++ b/Scripts/Engines/MLQuests/Items/UnicornRibs.cs @@ -5,7 +5,7 @@ namespace Server.Items { public class UnicornRibs : Item { - public override int LabelNumber{ get{ return 1074611; } } // Unicorn Ribs + public override int LabelNumber => 1074611; // Unicorn Ribs [Constructible] public UnicornRibs() : this( 1 ) diff --git a/Scripts/Engines/MLQuests/MLQuest.cs b/Scripts/Engines/MLQuests/MLQuest.cs index 934d37dc7..a26553652 100644 --- a/Scripts/Engines/MLQuests/MLQuest.cs +++ b/Scripts/Engines/MLQuests/MLQuest.cs @@ -122,8 +122,8 @@ namespace Server.Engines.MLQuests get { return ( m_OneTimeOnly || m_HasRestartDelay ); } } - public virtual bool IsChainTriggered { get { return false; } } - public virtual Type NextQuest { get { return null; } } + public virtual bool IsChainTriggered => false; + public virtual Type NextQuest => null; public TextDefinition Title { get { return m_Title; } set { m_Title = value; } } public TextDefinition Description { get { return m_Description; } set { m_Description = value; } } @@ -336,7 +336,7 @@ namespace Server.Engines.MLQuests quest.m_Deserialized = true; } - public virtual int Version { get { return 0; } } + public virtual int Version => 0; public virtual void Refresh( int oldVersion ) { diff --git a/Scripts/Engines/MLQuests/MLQuestSystem.cs b/Scripts/Engines/MLQuests/MLQuestSystem.cs index 84ae9cab6..7f33ee602 100644 --- a/Scripts/Engines/MLQuests/MLQuestSystem.cs +++ b/Scripts/Engines/MLQuests/MLQuestSystem.cs @@ -18,7 +18,7 @@ namespace Server.Engines.MLQuests { public static class MLQuestSystem { - public static bool Enabled { get { return Core.ML; } } + public static bool Enabled => Core.ML; public const int MaxConcurrentQuests = 10; public const int SpeechColor = 0x3B2; @@ -120,9 +120,7 @@ namespace Server.Engines.MLQuests private static void RegisterQuestGiver( MLQuest quest, Type questerType ) { - List questList; - - if ( !m_QuestGivers.TryGetValue( questerType, out questList ) ) + if (!m_QuestGivers.TryGetValue( questerType, out List questList )) m_QuestGivers[questerType] = questList = new List(); questList.Add( quest ); @@ -254,9 +252,8 @@ namespace Server.Engines.MLQuests } Type index = ScriptCompiler.FindTypeByName( e.GetString( 0 ) ); - MLQuest quest; - if ( index == null || !m_Quests.TryGetValue( index, out quest ) ) + if ( index == null || !m_Quests.TryGetValue( index, out MLQuest quest ) ) { m.SendMessage( "Invalid quest type name." ); return; @@ -590,17 +587,14 @@ namespace Server.Engines.MLQuests public static MLQuestContext GetContext( PlayerMobile pm ) { - MLQuestContext context; - m_Contexts.TryGetValue( pm, out context ); + m_Contexts.TryGetValue( pm, out MLQuestContext context ); return context; } public static MLQuestContext GetOrCreateContext( PlayerMobile pm ) { - MLQuestContext context; - - if ( !m_Contexts.TryGetValue( pm, out context ) ) + if (!m_Contexts.TryGetValue( pm, out MLQuestContext context )) m_Contexts[pm] = context = new MLQuestContext( pm ); return context; @@ -763,20 +757,14 @@ namespace Server.Engines.MLQuests public static MLQuest FindQuest( Type questType ) { - MLQuest result; - m_Quests.TryGetValue( questType, out result ); + m_Quests.TryGetValue( questType, out MLQuest result ); return result; } public static List FindQuestList( Type questerType ) { - List result; - - if ( m_QuestGivers.TryGetValue( questerType, out result ) ) - return result; - - return EmptyList; + return m_QuestGivers.TryGetValue(questerType, out List result) ? result : EmptyList; } } } diff --git a/Scripts/Engines/MLQuests/Mobiles/BoonCollector.cs b/Scripts/Engines/MLQuests/Mobiles/BoonCollector.cs index 8edfce42d..aeb42ac31 100644 --- a/Scripts/Engines/MLQuests/Mobiles/BoonCollector.cs +++ b/Scripts/Engines/MLQuests/Mobiles/BoonCollector.cs @@ -268,10 +268,10 @@ namespace Server.Engines.MLQuests.Mobiles typeof( TheJoysOfLife ) }; - public override TextDefinition[] Offer { get { return m_Offer; } } - public override TextDefinition[] Incomplete { get { return m_Incomplete; } } - public override TextDefinition[] Complete { get { return m_Complete; } } - public override Type[] Needed { get { return m_Needed; } } + public override TextDefinition[] Offer => m_Offer; + public override TextDefinition[] Incomplete => m_Incomplete; + public override TextDefinition[] Complete => m_Complete; + public override Type[] Needed => m_Needed; public override string DefaultName => "Darius"; @@ -365,10 +365,10 @@ namespace Server.Engines.MLQuests.Mobiles typeof( AllSeasonAdventurer ) }; - public override TextDefinition[] Offer { get { return m_Offer; } } - public override TextDefinition[] Incomplete { get { return m_Incomplete; } } - public override TextDefinition[] Complete { get { return m_Complete; } } - public override Type[] Needed { get { return m_Needed; } } + public override TextDefinition[] Offer => m_Offer; + public override TextDefinition[] Incomplete => m_Incomplete; + public override TextDefinition[] Complete => m_Complete; + public override Type[] Needed => m_Needed; public override string DefaultName => "Nedrick"; diff --git a/Scripts/Engines/MLQuests/Objectives/BaseObjective.cs b/Scripts/Engines/MLQuests/Objectives/BaseObjective.cs index 567a36a54..602cdf417 100644 --- a/Scripts/Engines/MLQuests/Objectives/BaseObjective.cs +++ b/Scripts/Engines/MLQuests/Objectives/BaseObjective.cs @@ -9,8 +9,8 @@ namespace Server.Engines.MLQuests.Objectives { public abstract class BaseObjective { - public virtual bool IsTimed { get { return false; } } - public virtual TimeSpan Duration { get { return TimeSpan.Zero; } } + public virtual bool IsTimed => false; + public virtual TimeSpan Duration => TimeSpan.Zero; public BaseObjective() { @@ -146,7 +146,7 @@ namespace Server.Engines.MLQuests.Objectives DeliverObjective } - public virtual DataType ExtraDataType { get { return DataType.None; } } + public virtual DataType ExtraDataType => DataType.None; public virtual void Serialize( GenericWriter writer ) { diff --git a/Scripts/Engines/MLQuests/Objectives/CollectObjective.cs b/Scripts/Engines/MLQuests/Objectives/CollectObjective.cs index 378c7dbe9..e21976e7a 100644 --- a/Scripts/Engines/MLQuests/Objectives/CollectObjective.cs +++ b/Scripts/Engines/MLQuests/Objectives/CollectObjective.cs @@ -117,7 +117,7 @@ namespace Server.Engines.MLQuests.Objectives private TimeSpan m_Duration; public override bool IsTimed => true; - public override TimeSpan Duration { get { return m_Duration; } } + public override TimeSpan Duration => m_Duration; public TimedCollectObjective( TimeSpan duration, int amount, Type type, TextDefinition name ) : base( amount, type, name ) diff --git a/Scripts/Engines/MLQuests/Objectives/DeliverObjective.cs b/Scripts/Engines/MLQuests/Objectives/DeliverObjective.cs index ff1392d2a..b94e0d230 100644 --- a/Scripts/Engines/MLQuests/Objectives/DeliverObjective.cs +++ b/Scripts/Engines/MLQuests/Objectives/DeliverObjective.cs @@ -132,7 +132,7 @@ namespace Server.Engines.MLQuests.Objectives private TimeSpan m_Duration; public override bool IsTimed => true; - public override TimeSpan Duration { get { return m_Duration; } } + public override TimeSpan Duration => m_Duration; public TimedDeliverObjective( TimeSpan duration, Type delivery, int amount, TextDefinition name, Type destination ) : this( duration, delivery, amount, name, destination, true ) @@ -272,7 +272,7 @@ namespace Server.Engines.MLQuests.Objectives // No extra instance stuff printed for this objective } - public override DataType ExtraDataType { get { return DataType.DeliverObjective; } } + public override DataType ExtraDataType => DataType.DeliverObjective; public override void Serialize( GenericWriter writer ) { diff --git a/Scripts/Engines/MLQuests/Objectives/EscortObjective.cs b/Scripts/Engines/MLQuests/Objectives/EscortObjective.cs index 99fc33e5b..ae79bec9e 100644 --- a/Scripts/Engines/MLQuests/Objectives/EscortObjective.cs +++ b/Scripts/Engines/MLQuests/Objectives/EscortObjective.cs @@ -274,7 +274,7 @@ namespace Server.Engines.MLQuests.Objectives // No extra instance stuff printed for this objective } - public override DataType ExtraDataType { get { return DataType.EscortObjective; } } + public override DataType ExtraDataType => DataType.EscortObjective; public override void Serialize( GenericWriter writer ) { diff --git a/Scripts/Engines/MLQuests/Objectives/KillObjective.cs b/Scripts/Engines/MLQuests/Objectives/KillObjective.cs index 1d4c7c33a..1971514e6 100644 --- a/Scripts/Engines/MLQuests/Objectives/KillObjective.cs +++ b/Scripts/Engines/MLQuests/Objectives/KillObjective.cs @@ -97,7 +97,7 @@ namespace Server.Engines.MLQuests.Objectives private TimeSpan m_Duration; public override bool IsTimed => true; - public override TimeSpan Duration { get { return m_Duration; } } + public override TimeSpan Duration => m_Duration; public TimedKillObjective( TimeSpan duration, int amount, Type[] types, TextDefinition name ) : this( duration, amount, types, name, null ) @@ -182,7 +182,7 @@ namespace Server.Engines.MLQuests.Objectives y += 16; } - public override DataType ExtraDataType { get { return DataType.KillObjective; } } + public override DataType ExtraDataType => DataType.KillObjective; public override void Serialize( GenericWriter writer ) { diff --git a/Scripts/Engines/MLQuests/QuesterNameAttribute.cs b/Scripts/Engines/MLQuests/QuesterNameAttribute.cs index cf9da3c70..6f5595e21 100644 --- a/Scripts/Engines/MLQuests/QuesterNameAttribute.cs +++ b/Scripts/Engines/MLQuests/QuesterNameAttribute.cs @@ -9,7 +9,7 @@ namespace Server.Engines.MLQuests { private string m_QuesterName; - public string QuesterName { get { return m_QuesterName; } } + public string QuesterName => m_QuesterName; public QuesterNameAttribute( string questerName ) { @@ -24,9 +24,7 @@ namespace Server.Engines.MLQuests if ( t == null ) return ""; - string result; - - if ( m_Cache.TryGetValue( t, out result ) ) + if (m_Cache.TryGetValue( t, out string result )) return result; object[] attributes = t.GetCustomAttributes( m_Type, false ); diff --git a/Scripts/Engines/Party/Party.cs b/Scripts/Engines/Party/Party.cs index 2df8d72ee..07ee0dae4 100644 --- a/Scripts/Engines/Party/Party.cs +++ b/Scripts/Engines/Party/Party.cs @@ -361,7 +361,7 @@ namespace Server.Engines.PartySystem } private void SendToStaffMessage( Mobile from, string text ) - { + { Packet p = null; foreach( NetState ns in from.GetClientsInRange( 8 ) ) @@ -460,7 +460,7 @@ namespace Server.Engines.PartySystem public bool Active{ get{ return m_Members.Count > 1; } } public Mobile Leader{ get{ return m_Leader; } } public List Members{ get{ return m_Members; } } - public List Candidates { get { return m_Candidates; } } + public List Candidates => m_Candidates; public PartyMemberInfo this[int index]{ get{ return m_Members[index]; } } public PartyMemberInfo this[Mobile m] @@ -475,4 +475,4 @@ namespace Server.Engines.PartySystem } } } -} \ No newline at end of file +} diff --git a/Scripts/Engines/Plants/MiscItems/GreenThorns.cs b/Scripts/Engines/Plants/MiscItems/GreenThorns.cs index 4aef76f90..3ef799b57 100644 --- a/Scripts/Engines/Plants/MiscItems/GreenThorns.cs +++ b/Scripts/Engines/Plants/MiscItems/GreenThorns.cs @@ -8,7 +8,7 @@ namespace Server.Items { public class GreenThorns : Item { - public override int LabelNumber { get { return 1060837; } } // green thorns + public override int LabelNumber => 1060837; // green thorns [Constructible] public GreenThorns() : this( 1 ) @@ -151,8 +151,8 @@ namespace Server.Items private int[] m_Tiles; private Type m_Effect; - public int[] Tiles { get { return m_Tiles; } } - public Type Effect { get { return m_Effect; } } + public int[] Tiles => m_Tiles; + public Type Effect => m_Effect; public TilesAndEffect( int[] tiles, Type effect ) { @@ -293,9 +293,9 @@ namespace Server.Items private Map m_Map; private Mobile m_From; - public Point3D Location { get { return m_Location; } } - public Map Map { get { return m_Map; } } - public Mobile From { get { return m_From; } } + public Point3D Location => m_Location; + public Map Map => m_Map; + public Mobile From => m_From; public GreenThornsEffect( Point3D location, Map map, Mobile from ) : base( TimeSpan.FromSeconds( 2.5 ) ) { @@ -724,4 +724,4 @@ namespace Server.Items Delete(); } } -} \ No newline at end of file +} diff --git a/Scripts/Engines/Plants/MiscItems/OrangePetals.cs b/Scripts/Engines/Plants/MiscItems/OrangePetals.cs index 604d8b0a4..426958e7c 100644 --- a/Scripts/Engines/Plants/MiscItems/OrangePetals.cs +++ b/Scripts/Engines/Plants/MiscItems/OrangePetals.cs @@ -8,7 +8,7 @@ namespace Server.Items { public class OrangePetals : Item { - public override int LabelNumber { get { return 1053122; } } // orange petals + public override int LabelNumber => 1053122; // orange petals public override double DefaultWeight { @@ -32,8 +32,8 @@ namespace Server.Items { } - public override bool CheckItemUse( Mobile from, Item item ) - { + public override bool CheckItemUse( Mobile from, Item item ) + { if ( item != this ) return base.CheckItemUse( from, item ); @@ -146,4 +146,4 @@ namespace Server.Items int version = reader.ReadInt(); } } -} \ No newline at end of file +} diff --git a/Scripts/Engines/Plants/MiscItems/RedLeaves.cs b/Scripts/Engines/Plants/MiscItems/RedLeaves.cs index 6cbe63cc5..4432e6390 100644 --- a/Scripts/Engines/Plants/MiscItems/RedLeaves.cs +++ b/Scripts/Engines/Plants/MiscItems/RedLeaves.cs @@ -6,7 +6,7 @@ namespace Server.Items { public class RedLeaves : Item { - public override int LabelNumber { get { return 1053123; } } // red leaves + public override int LabelNumber => 1053123; // red leaves public override double DefaultWeight { @@ -105,4 +105,4 @@ namespace Server.Items int version = reader.ReadInt(); } } -} \ No newline at end of file +} diff --git a/Scripts/Engines/Plants/MiscMobiles/GiantIceWorm.cs b/Scripts/Engines/Plants/MiscMobiles/GiantIceWorm.cs index ccdb20b86..56532a241 100644 --- a/Scripts/Engines/Plants/MiscMobiles/GiantIceWorm.cs +++ b/Scripts/Engines/Plants/MiscMobiles/GiantIceWorm.cs @@ -47,11 +47,11 @@ namespace Server.Mobiles MinTameSkill = 71.1; } - public override Poison PoisonImmune { get { return Poison.Greater; } } + public override Poison PoisonImmune => Poison.Greater; - public override Poison HitPoison { get { return Poison.Greater; } } + public override Poison HitPoison => Poison.Greater; - public override FoodType FavoriteFood { get { return FoodType.Meat; } } + public override FoodType FavoriteFood => FoodType.Meat; public GiantIceWorm( Serial serial ) : base ( serial ) { diff --git a/Scripts/Engines/Plants/PlantBowl.cs b/Scripts/Engines/Plants/PlantBowl.cs index b664b5107..38c5a44cb 100644 --- a/Scripts/Engines/Plants/PlantBowl.cs +++ b/Scripts/Engines/Plants/PlantBowl.cs @@ -8,7 +8,7 @@ namespace Server.Engines.Plants { public class PlantBowl : Item { - public override int LabelNumber { get { return 1060834; } } // a plant bowl + public override int LabelNumber => 1060834; // a plant bowl [Constructible] public PlantBowl() : base( 0x15FD ) @@ -190,4 +190,4 @@ namespace Server.Engines.Plants 0x72C9, 0x72CA, }; } -} \ No newline at end of file +} diff --git a/Scripts/Engines/Plants/PlantHue.cs b/Scripts/Engines/Plants/PlantHue.cs index 88ec1ca1d..fd6bbdc7b 100644 --- a/Scripts/Engines/Plants/PlantHue.cs +++ b/Scripts/Engines/Plants/PlantHue.cs @@ -69,9 +69,7 @@ namespace Server.Engines.Plants public static PlantHueInfo GetInfo( PlantHue plantHue ) { - PlantHueInfo info = null; - - if (m_Table.TryGetValue(plantHue, out info)) + if (m_Table.TryGetValue( plantHue, out PlantHueInfo info )) return info; else return m_Table[PlantHue.Plain]; @@ -150,10 +148,10 @@ namespace Server.Engines.Plants private PlantHue m_PlantHue; private int m_GumpHue; - public int Hue { get { return m_Hue; } } - public int Name { get { return m_Name; } } - public PlantHue PlantHue { get { return m_PlantHue; } } - public int GumpHue { get { return m_GumpHue; } } + public int Hue => m_Hue; + public int Name => m_Name; + public PlantHue PlantHue => m_PlantHue; + public int GumpHue => m_GumpHue; private PlantHueInfo( int hue, int name, PlantHue plantHue ) : this( hue, name, plantHue, hue ) { @@ -187,4 +185,4 @@ namespace Server.Engines.Plants return IsPrimary( m_PlantHue ); } } -} \ No newline at end of file +} diff --git a/Scripts/Engines/Plants/PlantItem.cs b/Scripts/Engines/Plants/PlantItem.cs index b78ca93b0..30209701c 100644 --- a/Scripts/Engines/Plants/PlantItem.cs +++ b/Scripts/Engines/Plants/PlantItem.cs @@ -55,7 +55,7 @@ namespace Server.Engines.Plants set{ m_Level = value; } } - public PlantSystem PlantSystem { get { return m_PlantSystem; } } + public PlantSystem PlantSystem => m_PlantSystem; public override bool ForceShowProperties => ObjectPropertyList.Enabled; diff --git a/Scripts/Engines/Plants/PlantResources.cs b/Scripts/Engines/Plants/PlantResources.cs index cd4dbae06..43fad4bbd 100644 --- a/Scripts/Engines/Plants/PlantResources.cs +++ b/Scripts/Engines/Plants/PlantResources.cs @@ -34,9 +34,9 @@ namespace Server.Engines.Plants private PlantHue m_PlantHue; private Type m_ResourceType; - public PlantType PlantType { get { return m_PlantType; } } - public PlantHue PlantHue { get { return m_PlantHue; } } - public Type ResourceType { get { return m_ResourceType; } } + public PlantType PlantType => m_PlantType; + public PlantHue PlantHue => m_PlantHue; + public Type ResourceType => m_ResourceType; private PlantResourceInfo( PlantType plantType, PlantHue plantHue, Type resourceType ) { @@ -50,4 +50,4 @@ namespace Server.Engines.Plants return (Item)Activator.CreateInstance( m_ResourceType ); } } -} \ No newline at end of file +} diff --git a/Scripts/Engines/Plants/PlantSystem.cs b/Scripts/Engines/Plants/PlantSystem.cs index 7bd902198..784b2048a 100644 --- a/Scripts/Engines/Plants/PlantSystem.cs +++ b/Scripts/Engines/Plants/PlantSystem.cs @@ -55,7 +55,7 @@ namespace Server.Engines.Plants private int m_AvailableResources; private int m_LeftResources; - public PlantItem Plant { get { return m_Plant; } } + public PlantItem Plant => m_Plant; public bool FertileDirt { @@ -712,4 +712,4 @@ namespace Server.Engines.Plants m_SeedHue |= PlantHue.Reproduces; } } -} \ No newline at end of file +} diff --git a/Scripts/Engines/Plants/PlantType.cs b/Scripts/Engines/Plants/PlantType.cs index 379921cc0..8602f90f8 100644 --- a/Scripts/Engines/Plants/PlantType.cs +++ b/Scripts/Engines/Plants/PlantType.cs @@ -322,17 +322,17 @@ namespace Server.Engines.Plants private int m_SeedLabel; private int m_SeedLabelPlural; - public int ItemID { get { return m_ItemID; } } - public int OffsetX { get { return m_OffsetX; } } - public int OffsetY { get { return m_OffsetY; } } - public PlantType PlantType { get { return m_PlantType; } } - public PlantCategory PlantCategory { get { return m_PlantCategory; } } + public int ItemID => m_ItemID; + public int OffsetX => m_OffsetX; + public int OffsetY => m_OffsetY; + public PlantType PlantType => m_PlantType; + public PlantCategory PlantCategory => m_PlantCategory; public int Name { get { return ( m_ItemID < 0x4000 ) ? 1020000 + m_ItemID : 1078872 + m_ItemID; } } - public bool ContainsPlant { get { return m_ContainsPlant; } } - public bool Flowery { get { return m_Flowery; } } - public bool Crossable { get { return m_Crossable; } } - public bool Reproduces { get { return m_Reproduces; } } + public bool ContainsPlant => m_ContainsPlant; + public bool Flowery => m_Flowery; + public bool Crossable => m_Crossable; + public bool Reproduces => m_Reproduces; private PlantTypeInfo( int itemID, int offsetX, int offsetY, PlantType plantType, bool containsPlant, bool flowery, bool crossable, bool reproduces, PlantCategory plantCategory ) : this( itemID, offsetX, offsetY, plantType, containsPlant, flowery, crossable, reproduces, plantCategory, -1, -1, -1, -1, -1, -1 ) @@ -358,4 +358,4 @@ namespace Server.Engines.Plants m_SeedLabelPlural = seedLabelPlural; } } -} \ No newline at end of file +} diff --git a/Scripts/Engines/Plants/Seed.cs b/Scripts/Engines/Plants/Seed.cs index cc4de7487..45aed26e0 100644 --- a/Scripts/Engines/Plants/Seed.cs +++ b/Scripts/Engines/Plants/Seed.cs @@ -45,7 +45,7 @@ namespace Server.Engines.Plants } } - public override int LabelNumber{ get { return 1060810; } } // seed + public override int LabelNumber => 1060810; // seed public static Seed RandomBonsaiSeed() { diff --git a/Scripts/Engines/Quests/Ambitious Solen Queen/AmbitiousQueenQuest.cs b/Scripts/Engines/Quests/Ambitious Solen Queen/AmbitiousQueenQuest.cs index 8da31af01..1d618837c 100644 --- a/Scripts/Engines/Quests/Ambitious Solen Queen/AmbitiousQueenQuest.cs +++ b/Scripts/Engines/Quests/Ambitious Solen Queen/AmbitiousQueenQuest.cs @@ -23,7 +23,7 @@ namespace Server.Engines.Quests.Ambitious typeof( Ambitious.GetRewardObjective ) }; - public override Type[] TypeReferenceTable{ get{ return m_TypeReferenceTable; } } + public override Type[] TypeReferenceTable => m_TypeReferenceTable; public override object Name { @@ -66,10 +66,10 @@ namespace Server.Engines.Quests.Ambitious } } - public override TimeSpan RestartDelay{ get{ return TimeSpan.Zero; } } + public override TimeSpan RestartDelay => TimeSpan.Zero; public override bool IsTutorial => false; - public override int Picture{ get{ return 0x15C9; } } + public override int Picture => 0x15C9; private bool m_RedSolen; diff --git a/Scripts/Engines/Quests/Ambitious Solen Queen/Objectives.cs b/Scripts/Engines/Quests/Ambitious Solen Queen/Objectives.cs index f2f8f158b..c41a6a49f 100644 --- a/Scripts/Engines/Quests/Ambitious Solen Queen/Objectives.cs +++ b/Scripts/Engines/Quests/Ambitious Solen Queen/Objectives.cs @@ -16,7 +16,7 @@ namespace Server.Engines.Quests.Ambitious } } - public override int MaxProgress{ get{ return 5; } } + public override int MaxProgress => 5; public KillQueensObjective() { @@ -172,4 +172,4 @@ namespace Server.Engines.Quests.Ambitious writer.Write( (bool) m_Gold ); } } -} \ No newline at end of file +} diff --git a/Scripts/Engines/Quests/Collector/CollectorQuest.cs b/Scripts/Engines/Quests/Collector/CollectorQuest.cs index 118ebc5f7..a1acac0ff 100644 --- a/Scripts/Engines/Quests/Collector/CollectorQuest.cs +++ b/Scripts/Engines/Quests/Collector/CollectorQuest.cs @@ -54,7 +54,7 @@ namespace Server.Engines.Quests.Collector typeof( Collector.MakeRoomObjective ) }; - public override Type[] TypeReferenceTable{ get{ return m_TypeReferenceTable; } } + public override Type[] TypeReferenceTable => m_TypeReferenceTable; public override object Name { @@ -91,10 +91,10 @@ namespace Server.Engines.Quests.Collector } } - public override TimeSpan RestartDelay{ get{ return TimeSpan.Zero; } } + public override TimeSpan RestartDelay => TimeSpan.Zero; public override bool IsTutorial => false; - public override int Picture{ get{ return 0x15A9; } } + public override int Picture => 0x15A9; public CollectorQuest( PlayerMobile from ) : base( from ) { diff --git a/Scripts/Engines/Quests/Collector/Items/ImageType.cs b/Scripts/Engines/Quests/Collector/Items/ImageType.cs index 5160c6f52..fa4f4b894 100644 --- a/Scripts/Engines/Quests/Collector/Items/ImageType.cs +++ b/Scripts/Engines/Quests/Collector/Items/ImageType.cs @@ -90,11 +90,11 @@ namespace Server.Engines.Quests.Collector private int m_X; private int m_Y; - public int Figurine { get { return m_Figurine; } } - public Type Type { get { return m_Type; } } + public int Figurine => m_Figurine; + public Type Type => m_Type; public int Name { get { return m_Figurine < 0x4000 ? 1020000 + m_Figurine : 1078872 + m_Figurine; } } - public int X { get { return m_X; } } - public int Y { get { return m_Y; } } + public int X => m_X; + public int Y => m_Y; public ImageTypeInfo( int figurine, Type type, int x, int y ) { @@ -104,4 +104,4 @@ namespace Server.Engines.Quests.Collector m_Y = y; } } -} \ No newline at end of file +} diff --git a/Scripts/Engines/Quests/Collector/Items/Obsidian.cs b/Scripts/Engines/Quests/Collector/Items/Obsidian.cs index 22e67c190..3262ad6d1 100644 --- a/Scripts/Engines/Quests/Collector/Items/Obsidian.cs +++ b/Scripts/Engines/Quests/Collector/Items/Obsidian.cs @@ -120,7 +120,7 @@ namespace Server.Engines.Quests.Collector set { m_StatueName = value; InvalidateProperties(); } } - public override bool ForceShowProperties { get { return ObjectPropertyList.Enabled; } } + public override bool ForceShowProperties => ObjectPropertyList.Enabled; [Constructible] public Obsidian() : base( 0x1EA7 ) @@ -261,4 +261,4 @@ namespace Server.Engines.Quests.Collector m_StatueName = Utility.Intern( reader.ReadString() ); } } -} \ No newline at end of file +} diff --git a/Scripts/Engines/Quests/Collector/Objectives.cs b/Scripts/Engines/Quests/Collector/Objectives.cs index 98cba9b49..206ee055d 100644 --- a/Scripts/Engines/Quests/Collector/Objectives.cs +++ b/Scripts/Engines/Quests/Collector/Objectives.cs @@ -15,7 +15,7 @@ namespace Server.Engines.Quests.Collector } } - public override int MaxProgress{ get{ return 6; } } + public override int MaxProgress => 6; public FishPearlsObjective() { @@ -530,4 +530,4 @@ namespace Server.Engines.Quests.Collector { } } -} \ No newline at end of file +} diff --git a/Scripts/Engines/Quests/Core/BaseQuester.cs b/Scripts/Engines/Quests/Core/BaseQuester.cs index 4d5dfbf8a..5474058c4 100644 --- a/Scripts/Engines/Quests/Core/BaseQuester.cs +++ b/Scripts/Engines/Quests/Core/BaseQuester.cs @@ -34,7 +34,7 @@ namespace Server.Engines.Quests public override bool IsActiveVendor => false; public override bool IsInvulnerable => true; public override bool DisallowAllMoves => true; - public override bool ClickTitle{ get { return false; } } + public override bool ClickTitle => false; public override bool CanTeach => false; public virtual int TalkNumber{ get{ return 6146; } } // Talk diff --git a/Scripts/Engines/Quests/Core/Items/DynamicTeleporter.cs b/Scripts/Engines/Quests/Core/Items/DynamicTeleporter.cs index 9cab9f30f..3eeb07483 100644 --- a/Scripts/Engines/Quests/Core/Items/DynamicTeleporter.cs +++ b/Scripts/Engines/Quests/Core/Items/DynamicTeleporter.cs @@ -6,7 +6,7 @@ namespace Server.Engines.Quests { public abstract class DynamicTeleporter : Item { - public override int LabelNumber{ get{ return 1049382; } } // a magical teleporter + public override int LabelNumber => 1049382; // a magical teleporter public DynamicTeleporter() : this( 0x1822, 0x482 ) { @@ -67,4 +67,4 @@ namespace Server.Engines.Quests int version = reader.ReadInt(); } } -} \ No newline at end of file +} diff --git a/Scripts/Engines/Quests/Core/Items/EnchantedSextant.cs b/Scripts/Engines/Quests/Core/Items/EnchantedSextant.cs index 72c3ebac1..7f634e617 100644 --- a/Scripts/Engines/Quests/Core/Items/EnchantedSextant.cs +++ b/Scripts/Engines/Quests/Core/Items/EnchantedSextant.cs @@ -68,7 +68,7 @@ namespace Server.Items private const double m_LongDistance = 300.0; private const double m_ShortDistance = 5.0; - public override int LabelNumber { get { return 1046226; } } // an enchanted sextant + public override int LabelNumber => 1046226; // an enchanted sextant [Constructible] public EnchantedSextant() : base( 0x1058 ) @@ -190,4 +190,4 @@ namespace Server.Items int version = reader.ReadInt(); } } -} \ No newline at end of file +} diff --git a/Scripts/Engines/Quests/Core/Items/HornOfRetreat.cs b/Scripts/Engines/Quests/Core/Items/HornOfRetreat.cs index 59191773f..eac821f36 100644 --- a/Scripts/Engines/Quests/Core/Items/HornOfRetreat.cs +++ b/Scripts/Engines/Quests/Core/Items/HornOfRetreat.cs @@ -34,7 +34,7 @@ namespace Server.Engines.Quests set{ m_Charges = value; InvalidateProperties(); } } - public override int LabelNumber{ get{ return 1049117; } } // Horn of Retreat + public override int LabelNumber => 1049117; // Horn of Retreat [Constructible] public HornOfRetreat() : base( 0xFC4 ) @@ -146,7 +146,7 @@ namespace Server.Engines.Quests public class HornOfRetreatMoongate : Moongate { - public override int LabelNumber{ get{ return 1049114; } } // Sanctuary Gate + public override int LabelNumber => 1049114; // Sanctuary Gate private Mobile m_Caster; @@ -203,4 +203,4 @@ namespace Server.Engines.Quests Delete(); } } -} \ No newline at end of file +} diff --git a/Scripts/Engines/Quests/Core/Items/QuestItem.cs b/Scripts/Engines/Quests/Core/Items/QuestItem.cs index bc059c9b7..2c320c21b 100644 --- a/Scripts/Engines/Quests/Core/Items/QuestItem.cs +++ b/Scripts/Engines/Quests/Core/Items/QuestItem.cs @@ -16,7 +16,7 @@ namespace Server.Engines.Quests public abstract bool CanDrop( PlayerMobile pm ); - public virtual bool Accepted { get { return Deleted; } } + public virtual bool Accepted => Deleted; public override bool DropToWorld( Mobile from, Point3D p ) { @@ -118,4 +118,4 @@ namespace Server.Engines.Quests int version = reader.ReadInt(); } } -} \ No newline at end of file +} diff --git a/Scripts/Engines/Quests/Dark Tides/Conversations.cs b/Scripts/Engines/Quests/Dark Tides/Conversations.cs index 994ecff6e..b5de09086 100644 --- a/Scripts/Engines/Quests/Dark Tides/Conversations.cs +++ b/Scripts/Engines/Quests/Dark Tides/Conversations.cs @@ -106,7 +106,7 @@ namespace Server.Engines.Quests.Necro new QuestItemInfo( 1048032, 3702 ) // a bag }; - public override QuestItemInfo[] Info{ get{ return m_Info; } } + public override QuestItemInfo[] Info => m_Info; public ReanimateMaabusConversation() { @@ -157,7 +157,7 @@ namespace Server.Engines.Quests.Necro new QuestItemInfo( 1026153, 6178 ) // teleporter }; - public override QuestItemInfo[] Info{ get{ return m_Info; } } + public override QuestItemInfo[] Info => m_Info; public MaabasConversation() { @@ -282,7 +282,7 @@ namespace Server.Engines.Quests.Necro new QuestItemInfo( 1023643, 8787 ) // spellbook }; - public override QuestItemInfo[] Info{ get{ return m_Info; } } + public override QuestItemInfo[] Info => m_Info; public VaultOfSecretsConversation() { diff --git a/Scripts/Engines/Quests/Dark Tides/DarkTidesQuest.cs b/Scripts/Engines/Quests/Dark Tides/DarkTidesQuest.cs index 5241d2ab1..b2486d285 100644 --- a/Scripts/Engines/Quests/Dark Tides/DarkTidesQuest.cs +++ b/Scripts/Engines/Quests/Dark Tides/DarkTidesQuest.cs @@ -46,7 +46,7 @@ namespace Server.Engines.Quests.Necro typeof( Necro.HorusRewardConversation ) }; - public override Type[] TypeReferenceTable{ get{ return m_TypeReferenceTable; } } + public override Type[] TypeReferenceTable => m_TypeReferenceTable; public override object Name { @@ -99,10 +99,10 @@ namespace Server.Engines.Quests.Necro } } - public override TimeSpan RestartDelay{ get{ return TimeSpan.MaxValue; } } + public override TimeSpan RestartDelay => TimeSpan.MaxValue; public override bool IsTutorial => true; - public override int Picture{ get{ return 0x15B5; } } + public override int Picture => 0x15B5; public DarkTidesQuest( PlayerMobile from ) : base( from ) { diff --git a/Scripts/Engines/Quests/Dark Tides/Items/KronusScroll.cs b/Scripts/Engines/Quests/Dark Tides/Items/KronusScroll.cs index ab33c70af..60244f286 100644 --- a/Scripts/Engines/Quests/Dark Tides/Items/KronusScroll.cs +++ b/Scripts/Engines/Quests/Dark Tides/Items/KronusScroll.cs @@ -8,7 +8,7 @@ namespace Server.Engines.Quests.Necro { public class KronusScroll : QuestItem { - public override int LabelNumber { get { return 1060149; } } // Calling of Kronus + public override int LabelNumber => 1060149; // Calling of Kronus [Constructible] public KronusScroll() : base( 0x227A ) @@ -163,4 +163,4 @@ namespace Server.Engines.Quests.Necro int version = reader.ReadInt(); } } -} \ No newline at end of file +} diff --git a/Scripts/Engines/Quests/Dark Tides/Items/MaabusCoffin.cs b/Scripts/Engines/Quests/Dark Tides/Items/MaabusCoffin.cs index 8bf692802..794818343 100644 --- a/Scripts/Engines/Quests/Dark Tides/Items/MaabusCoffin.cs +++ b/Scripts/Engines/Quests/Dark Tides/Items/MaabusCoffin.cs @@ -10,7 +10,7 @@ namespace Server.Engines.Quests.Necro private Point3D m_SpawnLocation; [CommandProperty( AccessLevel.GameMaster )] - public Maabus Maabus { get { return m_Maabus; } } + public Maabus Maabus => m_Maabus; [CommandProperty( AccessLevel.GameMaster )] public Point3D SpawnLocation { get { return m_SpawnLocation; } set { m_SpawnLocation = value; } } @@ -155,4 +155,4 @@ namespace Server.Engines.Quests.Necro m_EmptyItemID = reader.ReadInt(); } } -} \ No newline at end of file +} diff --git a/Scripts/Engines/Quests/Dark Tides/Items/ScrollOfAbraxus.cs b/Scripts/Engines/Quests/Dark Tides/Items/ScrollOfAbraxus.cs index 3fda445a5..444015c16 100644 --- a/Scripts/Engines/Quests/Dark Tides/Items/ScrollOfAbraxus.cs +++ b/Scripts/Engines/Quests/Dark Tides/Items/ScrollOfAbraxus.cs @@ -10,7 +10,7 @@ namespace Server.Engines.Quests.Necro { public class ScrollOfAbraxus : QuestItem { - public override int LabelNumber { get { return 1028827; } } // Scroll of Abraxus + public override int LabelNumber => 1028827; // Scroll of Abraxus [Constructible] public ScrollOfAbraxus() : base( 0x227B ) @@ -105,42 +105,42 @@ namespace Server.Engines.Quests.Necro AddImage( 340, 255, 9005 ); /* Security at the Crystal Cave

- * + * * We have taken great measuresto ensure the safety of the * Scroll of Calling, which we have so valiantly taken from * the Necromancer Maabus during the battle of the wood * nearly 200 years ago.

- * + * * The scroll must never fall into the hands of the * Necromancers again, lest they use it to summon the ancient * daemon Kronus. The scroll of calling is a necessity in the * series of dark rites the Necromancers must perform to once again * re-awaken Kronus.

- * + * * Should Kronus ever rise again, the days of the Paladins, and * indeed humanity as we know it will be numbered.

- * + * * For this reason, we have posted the honorable Horus, former * General of the Northern Legions to guard the entrance of the * Crystal Cave where we keep the Scroll of Calling. Horus was * infused with magical life from the tree Urywen during his last * battle. The power gave him eternal life, but it also, * unfortunately, took his eye sight.

- * + * * Since Horus cannot see those he admits to the Crystal Cave, * he will only allow those that know the secret password to enter. * Speak the following word to Horus and he shall grant you passage * to the Crystal Cave:

- * + * * Urywen

- * + * * Do not speak this password anywhere except when seeking passage * into the Crystal Cave, as our adversaries are lurking in the - * shadows – they are everywhere.

Go with the light, friend.

- * + * shadows � they are everywhere.

Go with the light, friend.

+ * * - Frater Melkeer */ AddHtmlLocalized( 25, 36, 350, 210, 1060116, 1, false, true ); } } -} \ No newline at end of file +} diff --git a/Scripts/Engines/Quests/Dark Tides/Mobiles/SummonedPaladin.cs b/Scripts/Engines/Quests/Dark Tides/Mobiles/SummonedPaladin.cs index b9d1fda91..3781a9730 100644 --- a/Scripts/Engines/Quests/Dark Tides/Mobiles/SummonedPaladin.cs +++ b/Scripts/Engines/Quests/Dark Tides/Mobiles/SummonedPaladin.cs @@ -54,9 +54,9 @@ namespace Server.Engines.Quests.Necro return base.IsHarmfulCriminal( target ); } - public override bool ClickTitle{ get { return false; } } + public override bool ClickTitle => false; - public override bool PlayerRangeSensitive{ get { return false; } } + public override bool PlayerRangeSensitive => false; public override void OnThink() { @@ -238,4 +238,4 @@ namespace Server.Engines.Quests.Necro Delete(); } } -} \ No newline at end of file +} diff --git a/Scripts/Engines/Quests/Dark Tides/Objectives.cs b/Scripts/Engines/Quests/Dark Tides/Objectives.cs index 84d416db8..a3f54f46f 100644 --- a/Scripts/Engines/Quests/Dark Tides/Objectives.cs +++ b/Scripts/Engines/Quests/Dark Tides/Objectives.cs @@ -23,7 +23,7 @@ namespace Server.Engines.Quests.Necro new QuestItemInfo( 1023643, 8787 ) // spellbook }; - public override QuestItemInfo[] Info{ get{ return m_Info; } } + public override QuestItemInfo[] Info => m_Info; public AnimateMaabusCorpseObjective() { @@ -188,7 +188,7 @@ namespace Server.Engines.Quests.Necro new QuestItemInfo( 1023676, 3679 ) // glowing rune }; - public override QuestItemInfo[] Info{ get{ return m_Info; } } + public override QuestItemInfo[] Info => m_Info; public FindVaultOfSecretsObjective() { @@ -307,7 +307,7 @@ namespace Server.Engines.Quests.Necro new QuestItemInfo( 1026153, 6178 ) // teleporter }; - public override QuestItemInfo[] Info{ get{ return m_Info; } } + public override QuestItemInfo[] Info => m_Info; public ReturnToCrystalCaveObjective() { @@ -639,4 +639,4 @@ namespace Server.Engines.Quests.Necro System.AddConversation( new BankerConversation() ); } } -} \ No newline at end of file +} diff --git a/Scripts/Engines/Quests/Emino's Undertaking/EminosUndertakingQuest.cs b/Scripts/Engines/Quests/Emino's Undertaking/EminosUndertakingQuest.cs index a1aac3064..102fa6b28 100644 --- a/Scripts/Engines/Quests/Emino's Undertaking/EminosUndertakingQuest.cs +++ b/Scripts/Engines/Quests/Emino's Undertaking/EminosUndertakingQuest.cs @@ -44,7 +44,7 @@ namespace Server.Engines.Quests.Ninja typeof( Ninja.GiveEminoSwordObjective ) }; - public override Type[] TypeReferenceTable{ get{ return m_TypeReferenceTable; } } + public override Type[] TypeReferenceTable => m_TypeReferenceTable; public override object Name { @@ -64,10 +64,10 @@ namespace Server.Engines.Quests.Ninja } } - public override TimeSpan RestartDelay{ get{ return TimeSpan.MaxValue; } } + public override TimeSpan RestartDelay => TimeSpan.MaxValue; public override bool IsTutorial => true; - public override int Picture{ get{ return 0x15D5; } } + public override int Picture => 0x15D5; public EminosUndertakingQuest( PlayerMobile from ) : base( from ) { diff --git a/Scripts/Engines/Quests/Emino's Undertaking/Items/BlueNinjaQuestTeleporter.cs b/Scripts/Engines/Quests/Emino's Undertaking/Items/BlueNinjaQuestTeleporter.cs index 27dddb0ea..c61a05808 100644 --- a/Scripts/Engines/Quests/Emino's Undertaking/Items/BlueNinjaQuestTeleporter.cs +++ b/Scripts/Engines/Quests/Emino's Undertaking/Items/BlueNinjaQuestTeleporter.cs @@ -6,14 +6,14 @@ namespace Server.Engines.Quests.Ninja { public class BlueNinjaQuestTeleporter : DynamicTeleporter { - public override int LabelNumber{ get{ return 1026157; } } // teleporter + public override int LabelNumber => 1026157; // teleporter [Constructible] public BlueNinjaQuestTeleporter() : base( 0x51C, 0x2 ) { } - public override int NotWorkingMessage{ get{ return 1063198; } } // You stand on the strange floor tile but nothing happens. + public override int NotWorkingMessage => 1063198; // You stand on the strange floor tile but nothing happens. public override bool GetDestination( PlayerMobile player, ref Point3D loc, ref Map map ) { @@ -48,4 +48,4 @@ namespace Server.Engines.Quests.Ninja int version = reader.ReadInt(); } } -} \ No newline at end of file +} diff --git a/Scripts/Engines/Quests/Emino's Undertaking/Items/EminosKatana.cs b/Scripts/Engines/Quests/Emino's Undertaking/Items/EminosKatana.cs index 8719fb4ed..764ae0ec5 100644 --- a/Scripts/Engines/Quests/Emino's Undertaking/Items/EminosKatana.cs +++ b/Scripts/Engines/Quests/Emino's Undertaking/Items/EminosKatana.cs @@ -6,7 +6,7 @@ namespace Server.Engines.Quests.Ninja { public class EminosKatana : QuestItem { - public override int LabelNumber{ get{ return 1063214; } } // Daimyo Emino's Katana + public override int LabelNumber => 1063214; // Daimyo Emino's Katana [Constructible] public EminosKatana() : base( 0x13FF ) @@ -45,4 +45,4 @@ namespace Server.Engines.Quests.Ninja int version = reader.ReadEncodedInt(); } } -} \ No newline at end of file +} diff --git a/Scripts/Engines/Quests/Emino's Undertaking/Items/GreenNinjaQuestTeleporter.cs b/Scripts/Engines/Quests/Emino's Undertaking/Items/GreenNinjaQuestTeleporter.cs index 9ab12e5ab..588283dd9 100644 --- a/Scripts/Engines/Quests/Emino's Undertaking/Items/GreenNinjaQuestTeleporter.cs +++ b/Scripts/Engines/Quests/Emino's Undertaking/Items/GreenNinjaQuestTeleporter.cs @@ -6,14 +6,14 @@ namespace Server.Engines.Quests.Ninja { public class GreenNinjaQuestTeleporter : DynamicTeleporter { - public override int LabelNumber{ get{ return 1026157; } } // teleporter + public override int LabelNumber => 1026157; // teleporter [Constructible] public GreenNinjaQuestTeleporter() : base( 0x51C, 0x17E ) { } - public override int NotWorkingMessage{ get{ return 1063198; } } // You stand on the strange floor tile but nothing happens. + public override int NotWorkingMessage => 1063198; // You stand on the strange floor tile but nothing happens. public override bool GetDestination( PlayerMobile player, ref Point3D loc, ref Map map ) { @@ -48,4 +48,4 @@ namespace Server.Engines.Quests.Ninja int version = reader.ReadInt(); } } -} \ No newline at end of file +} diff --git a/Scripts/Engines/Quests/Emino's Undertaking/Items/NoteForZoel.cs b/Scripts/Engines/Quests/Emino's Undertaking/Items/NoteForZoel.cs index 55d724d54..bd1b3e19a 100644 --- a/Scripts/Engines/Quests/Emino's Undertaking/Items/NoteForZoel.cs +++ b/Scripts/Engines/Quests/Emino's Undertaking/Items/NoteForZoel.cs @@ -7,7 +7,7 @@ namespace Server.Engines.Quests.Ninja { public class NoteForZoel : QuestItem { - public override int LabelNumber{ get{ return 1063186; } } // A Note for Zoel + public override int LabelNumber => 1063186; // A Note for Zoel [Constructible] public NoteForZoel() : base( 0x14EF ) @@ -45,4 +45,4 @@ namespace Server.Engines.Quests.Ninja int version = reader.ReadInt(); } } -} \ No newline at end of file +} diff --git a/Scripts/Engines/Quests/Emino's Undertaking/Items/WhiteNinjaQuestTeleporter.cs b/Scripts/Engines/Quests/Emino's Undertaking/Items/WhiteNinjaQuestTeleporter.cs index b22d72138..6c510d8dd 100644 --- a/Scripts/Engines/Quests/Emino's Undertaking/Items/WhiteNinjaQuestTeleporter.cs +++ b/Scripts/Engines/Quests/Emino's Undertaking/Items/WhiteNinjaQuestTeleporter.cs @@ -6,14 +6,14 @@ namespace Server.Engines.Quests.Ninja { public class WhiteNinjaQuestTeleporter : DynamicTeleporter { - public override int LabelNumber{ get{ return 1026157; } } // teleporter + public override int LabelNumber => 1026157; // teleporter [Constructible] public WhiteNinjaQuestTeleporter() : base( 0x51C, 0x47E ) { } - public override int NotWorkingMessage{ get{ return 1063198; } } // You stand on the strange floor tile but nothing happens. + public override int NotWorkingMessage => 1063198; // You stand on the strange floor tile but nothing happens. public override bool GetDestination( PlayerMobile player, ref Point3D loc, ref Map map ) { @@ -56,4 +56,4 @@ namespace Server.Engines.Quests.Ninja int version = reader.ReadInt(); } } -} \ No newline at end of file +} diff --git a/Scripts/Engines/Quests/Emino's Undertaking/Mobiles/EnshroudedFigure.cs b/Scripts/Engines/Quests/Emino's Undertaking/Mobiles/EnshroudedFigure.cs index ada506448..d6108677f 100644 --- a/Scripts/Engines/Quests/Emino's Undertaking/Mobiles/EnshroudedFigure.cs +++ b/Scripts/Engines/Quests/Emino's Undertaking/Mobiles/EnshroudedFigure.cs @@ -30,7 +30,7 @@ namespace Server.Engines.Quests.Ninja AddItem( new ThighBoots() ); } - public override int TalkNumber{ get{ return -1; } } + public override int TalkNumber => -1; public override void OnTalk( PlayerMobile player, bool contextMenu ) { diff --git a/Scripts/Engines/Quests/Emino's Undertaking/Mobiles/HiddenFigure.cs b/Scripts/Engines/Quests/Emino's Undertaking/Mobiles/HiddenFigure.cs index 685ea87ad..38d5f907c 100644 --- a/Scripts/Engines/Quests/Emino's Undertaking/Mobiles/HiddenFigure.cs +++ b/Scripts/Engines/Quests/Emino's Undertaking/Mobiles/HiddenFigure.cs @@ -10,7 +10,7 @@ namespace Server.Engines.Quests.Ninja { public static int[] Messages = new int[] { - 1063191, // They won’t find me here. + 1063191, // They won�t find me here. 1063192 // Ah, a quiet hideout. }; @@ -64,7 +64,7 @@ namespace Server.Engines.Quests.Ninja return 3; } - public override int TalkNumber{ get{ return -1; } } + public override int TalkNumber => -1; public override void OnTalk( PlayerMobile player, bool contextMenu ) { @@ -93,4 +93,4 @@ namespace Server.Engines.Quests.Ninja m_Message = reader.ReadInt(); } } -} \ No newline at end of file +} diff --git a/Scripts/Engines/Quests/Emino's Undertaking/Mobiles/JedahEntille.cs b/Scripts/Engines/Quests/Emino's Undertaking/Mobiles/JedahEntille.cs index b4871f883..338f4a6da 100644 --- a/Scripts/Engines/Quests/Emino's Undertaking/Mobiles/JedahEntille.cs +++ b/Scripts/Engines/Quests/Emino's Undertaking/Mobiles/JedahEntille.cs @@ -34,7 +34,7 @@ namespace Server.Engines.Quests.Ninja AddItem( new FloppyHat() ); } - public override int TalkNumber{ get{ return -1; } } + public override int TalkNumber => -1; public override void OnTalk( PlayerMobile player, bool contextMenu ) { diff --git a/Scripts/Engines/Quests/Emino's Undertaking/Objectives.cs b/Scripts/Engines/Quests/Emino's Undertaking/Objectives.cs index bd812bb9c..a0cf4f596 100644 --- a/Scripts/Engines/Quests/Emino's Undertaking/Objectives.cs +++ b/Scripts/Engines/Quests/Emino's Undertaking/Objectives.cs @@ -80,7 +80,7 @@ namespace Server.Engines.Quests.Ninja public bool TaughtHowToUseSkills { - get{ return m_TaughtHowToUseSkills; } + get{ return m_TaughtHowToUseSkills; } set{ m_TaughtHowToUseSkills = value; } } @@ -152,8 +152,8 @@ namespace Server.Engines.Quests.Ninja { get { - /* Bring the note to Elite Ninja Zoel and speak with him again. - * He is near the cave entrance. You can hand the note to Zoel + /* Bring the note to Elite Ninja Zoel and speak with him again. + * He is near the cave entrance. You can hand the note to Zoel * by dragging it and dropping it on his body. */ return 1063185; @@ -208,7 +208,7 @@ namespace Server.Engines.Quests.Ninja { get { - // Go back through the blue teleporter and tell Daimyo Emino what you’ve overheard. + // Go back through the blue teleporter and tell Daimyo Emino what you�ve overheard. return 1063197; } } @@ -229,9 +229,9 @@ namespace Server.Engines.Quests.Ninja { get { - /* Take the white teleporter and check the chests for the sword. - * Leave everything else behind. Avoid damage from traps you may - * encounter. To use a potion, make sure at least one hand is + /* Take the white teleporter and check the chests for the sword. + * Leave everything else behind. Avoid damage from traps you may + * encounter. To use a potion, make sure at least one hand is * free and double click on the bottle. */ return 1063200; @@ -262,8 +262,8 @@ namespace Server.Engines.Quests.Ninja { get { - /* Walk through the hallway being careful - * to avoid the traps. You may be able to + /* Walk through the hallway being careful + * to avoid the traps. You may be able to * time the traps to avoid injury. */ return 1063202; @@ -338,7 +338,7 @@ namespace Server.Engines.Quests.Ninja { } - public override int MaxProgress{ get{ return 3; } } + public override int MaxProgress => 3; public override void RenderProgress( BaseQuestGump gump ) { @@ -390,4 +390,4 @@ namespace Server.Engines.Quests.Ninja { } } -} \ No newline at end of file +} diff --git a/Scripts/Engines/Quests/Haochi's Trials/HaochisTrialsQuest.cs b/Scripts/Engines/Quests/Haochi's Trials/HaochisTrialsQuest.cs index 2e9082115..c1e17de73 100644 --- a/Scripts/Engines/Quests/Haochi's Trials/HaochisTrialsQuest.cs +++ b/Scripts/Engines/Quests/Haochi's Trials/HaochisTrialsQuest.cs @@ -47,7 +47,7 @@ namespace Server.Engines.Quests.Samurai typeof( Samurai.SeventhTrialReturnObjective ) }; - public override Type[] TypeReferenceTable{ get{ return m_TypeReferenceTable; } } + public override Type[] TypeReferenceTable => m_TypeReferenceTable; public override object Name { @@ -78,10 +78,10 @@ namespace Server.Engines.Quests.Samurai } } - public override TimeSpan RestartDelay{ get{ return TimeSpan.MaxValue; } } + public override TimeSpan RestartDelay => TimeSpan.MaxValue; public override bool IsTutorial => true; - public override int Picture{ get{ return 0x15D7; } } + public override int Picture => 0x15D7; public HaochisTrialsQuest( PlayerMobile from ) : base( from ) { diff --git a/Scripts/Engines/Quests/Haochi's Trials/Items/HaochisKatana.cs b/Scripts/Engines/Quests/Haochi's Trials/Items/HaochisKatana.cs index a04c72c68..b52373d82 100644 --- a/Scripts/Engines/Quests/Haochi's Trials/Items/HaochisKatana.cs +++ b/Scripts/Engines/Quests/Haochi's Trials/Items/HaochisKatana.cs @@ -6,7 +6,7 @@ namespace Server.Engines.Quests.Samurai { public class HaochisKatana : QuestItem { - public override int LabelNumber{ get{ return 1063165; } } // Daimyo Haochi's Katana + public override int LabelNumber => 1063165; // Daimyo Haochi's Katana [Constructible] public HaochisKatana() : base( 0x13FF ) @@ -43,4 +43,4 @@ namespace Server.Engines.Quests.Samurai int version = reader.ReadEncodedInt(); } } -} \ No newline at end of file +} diff --git a/Scripts/Engines/Quests/Haochi's Trials/Items/HonorCandle.cs b/Scripts/Engines/Quests/Haochi's Trials/Items/HonorCandle.cs index 0944ece87..dd2fe0a5f 100644 --- a/Scripts/Engines/Quests/Haochi's Trials/Items/HonorCandle.cs +++ b/Scripts/Engines/Quests/Haochi's Trials/Items/HonorCandle.cs @@ -9,8 +9,8 @@ namespace Server.Engines.Quests.Samurai { private static readonly TimeSpan LitDuration = TimeSpan.FromSeconds( 20.0 ); - public override int LitSound{ get{ return 0; } } - public override int UnlitSound{ get{ return 0; } } + public override int LitSound => 0; + public override int UnlitSound => 0; [Constructible] public HonorCandle() @@ -76,4 +76,4 @@ namespace Server.Engines.Quests.Samurai int version = reader.ReadEncodedInt(); } } -} \ No newline at end of file +} diff --git a/Scripts/Engines/Quests/Haochi's Trials/Objectives.cs b/Scripts/Engines/Quests/Haochi's Trials/Objectives.cs index e30d64db8..66b643e23 100644 --- a/Scripts/Engines/Quests/Haochi's Trials/Objectives.cs +++ b/Scripts/Engines/Quests/Haochi's Trials/Objectives.cs @@ -65,7 +65,7 @@ namespace Server.Engines.Quests.Samurai private int m_CursedSoulsKilled; private int m_YoungRoninKilled; - public override int MaxProgress{ get{ return 3; } } + public override int MaxProgress => 3; public override void OnKill( BaseCreature creature, Container corpse ) { @@ -410,7 +410,7 @@ namespace Server.Engines.Quests.Samurai { get { - // Retrieve Daimyo Haochi’s katana from the treasure room. + // Retrieve Daimyo Haochi�s katana from the treasure room. return 1063072; } } @@ -514,7 +514,7 @@ namespace Server.Engines.Quests.Samurai } } - public override int MaxProgress{ get{ return 3; } } + public override int MaxProgress => 3; public SeventhTrialIntroObjective() { @@ -552,4 +552,4 @@ namespace Server.Engines.Quests.Samurai System.AddConversation( new EndConversation() ); } } -} \ No newline at end of file +} diff --git a/Scripts/Engines/Quests/Solen Matriarch/Objectives.cs b/Scripts/Engines/Quests/Solen Matriarch/Objectives.cs index bc337bafd..4a6c56be4 100644 --- a/Scripts/Engines/Quests/Solen Matriarch/Objectives.cs +++ b/Scripts/Engines/Quests/Solen Matriarch/Objectives.cs @@ -16,7 +16,7 @@ namespace Server.Engines.Quests.Matriarch } } - public override int MaxProgress{ get{ return 7; } } + public override int MaxProgress => 7; public KillInfiltratorsObjective() { @@ -107,7 +107,7 @@ namespace Server.Engines.Quests.Matriarch } } - public override int MaxProgress{ get{ return 40; } } + public override int MaxProgress => 40; public GatherWaterObjective() { @@ -213,4 +213,4 @@ namespace Server.Engines.Quests.Matriarch System.AddConversation( new EndConversation() ); } } -} \ No newline at end of file +} diff --git a/Scripts/Engines/Quests/Solen Matriarch/SolenMatriarchQuest.cs b/Scripts/Engines/Quests/Solen Matriarch/SolenMatriarchQuest.cs index a7c4d4b1e..dea31b777 100644 --- a/Scripts/Engines/Quests/Solen Matriarch/SolenMatriarchQuest.cs +++ b/Scripts/Engines/Quests/Solen Matriarch/SolenMatriarchQuest.cs @@ -26,7 +26,7 @@ namespace Server.Engines.Quests.Matriarch typeof( Matriarch.GetRewardObjective ) }; - public override Type[] TypeReferenceTable{ get{ return m_TypeReferenceTable; } } + public override Type[] TypeReferenceTable => m_TypeReferenceTable; public override object Name { @@ -93,10 +93,10 @@ namespace Server.Engines.Quests.Matriarch } } - public override TimeSpan RestartDelay{ get{ return TimeSpan.Zero; } } + public override TimeSpan RestartDelay => TimeSpan.Zero; public override bool IsTutorial => false; - public override int Picture{ get{ return 0x15C9; } } + public override int Picture => 0x15C9; private bool m_RedSolen; diff --git a/Scripts/Engines/Quests/Study of the Solen Hive/Objectives.cs b/Scripts/Engines/Quests/Study of the Solen Hive/Objectives.cs index 9c0704ef8..f33994b65 100644 --- a/Scripts/Engines/Quests/Study of the Solen Hive/Objectives.cs +++ b/Scripts/Engines/Quests/Study of the Solen Hive/Objectives.cs @@ -14,7 +14,7 @@ namespace Server.Engines.Quests.Naturalist /* Find an entrance to the Solen Hive, and search within for the Solen * Egg Nests. Each Nest must be studied for some time without a break in * concentration in order to gather useful information.

- * + * * Once you have completed your study of the Nests, return to the Naturalist * who gave you this task. */ @@ -22,7 +22,7 @@ namespace Server.Engines.Quests.Naturalist } } - public override int MaxProgress{ get{ return NestArea.NonSpecialCount; } } + public override int MaxProgress => NestArea.NonSpecialCount; private NestArea m_CurrentNest; private DateTime m_StudyBegin; @@ -200,4 +200,4 @@ namespace Server.Engines.Quests.Naturalist gump.AddLabel( 130, 280, 0x64, count ); } } -} \ No newline at end of file +} diff --git a/Scripts/Engines/Quests/Study of the Solen Hive/StudyOfSolenQuest.cs b/Scripts/Engines/Quests/Study of the Solen Hive/StudyOfSolenQuest.cs index ad36cd7ca..8d80421a0 100644 --- a/Scripts/Engines/Quests/Study of the Solen Hive/StudyOfSolenQuest.cs +++ b/Scripts/Engines/Quests/Study of the Solen Hive/StudyOfSolenQuest.cs @@ -18,7 +18,7 @@ namespace Server.Engines.Quests.Naturalist typeof( FullBackpackConversation ) }; - public override Type[] TypeReferenceTable{ get{ return m_TypeReferenceTable; } } + public override Type[] TypeReferenceTable => m_TypeReferenceTable; public override object Name { @@ -65,10 +65,10 @@ namespace Server.Engines.Quests.Naturalist } } - public override TimeSpan RestartDelay{ get{ return TimeSpan.Zero; } } + public override TimeSpan RestartDelay => TimeSpan.Zero; public override bool IsTutorial => false; - public override int Picture{ get{ return 0x15C7; } } + public override int Picture => 0x15C7; private Naturalist m_Naturalist; diff --git a/Scripts/Engines/Quests/Terrible Hatchlings/Objectives.cs b/Scripts/Engines/Quests/Terrible Hatchlings/Objectives.cs index adb9c43d5..6d91d0858 100644 --- a/Scripts/Engines/Quests/Terrible Hatchlings/Objectives.cs +++ b/Scripts/Engines/Quests/Terrible Hatchlings/Objectives.cs @@ -56,7 +56,7 @@ namespace Server.Engines.Quests.Zento get { /* Great job! One less terrible hatchling in the Waste!

- * + * * Once you've killed 10 of the Deathwatch Beetle Hatchlings, * return to Ansella for your reward! */ @@ -132,7 +132,7 @@ namespace Server.Engines.Quests.Zento } } - public override int MaxProgress{ get{ return 10; } } + public override int MaxProgress => 10; public ThirdKillObjective( int startingProgress ) { @@ -175,4 +175,4 @@ namespace Server.Engines.Quests.Zento System.AddConversation( new EndConversation() ); } } -} \ No newline at end of file +} diff --git a/Scripts/Engines/Quests/Terrible Hatchlings/TerribleHatchlingsQuest.cs b/Scripts/Engines/Quests/Terrible Hatchlings/TerribleHatchlingsQuest.cs index fa2ad5d84..6b5b2d1fd 100644 --- a/Scripts/Engines/Quests/Terrible Hatchlings/TerribleHatchlingsQuest.cs +++ b/Scripts/Engines/Quests/Terrible Hatchlings/TerribleHatchlingsQuest.cs @@ -19,7 +19,7 @@ namespace Server.Engines.Quests.Zento typeof( ReturnObjective ) }; - public override Type[] TypeReferenceTable{ get{ return m_TypeReferenceTable; } } + public override Type[] TypeReferenceTable => m_TypeReferenceTable; public override object Name { @@ -46,10 +46,10 @@ namespace Server.Engines.Quests.Zento } } - public override TimeSpan RestartDelay{ get{ return TimeSpan.MaxValue; } } + public override TimeSpan RestartDelay => TimeSpan.MaxValue; public override bool IsTutorial => true; - public override int Picture{ get{ return 0x15CF; } } + public override int Picture => 0x15CF; public TerribleHatchlingsQuest( PlayerMobile from ) : base( from ) { diff --git a/Scripts/Engines/Quests/The Summoning/Items/BellOfTheDead.cs b/Scripts/Engines/Quests/The Summoning/Items/BellOfTheDead.cs index 0290e7542..408cacb2b 100644 --- a/Scripts/Engines/Quests/The Summoning/Items/BellOfTheDead.cs +++ b/Scripts/Engines/Quests/The Summoning/Items/BellOfTheDead.cs @@ -8,7 +8,7 @@ namespace Server.Engines.Quests.Doom { public class BellOfTheDead : Item { - public override int LabelNumber{ get{ return 1050018; } } // bell of the dead + public override int LabelNumber => 1050018; // bell of the dead [Constructible] public BellOfTheDead() : base( 0x91A ) @@ -132,4 +132,4 @@ namespace Server.Engines.Quests.Doom m_Chyloth.Delete(); } } -} \ No newline at end of file +} diff --git a/Scripts/Engines/Quests/The Summoning/Items/ChylothStaff.cs b/Scripts/Engines/Quests/The Summoning/Items/ChylothStaff.cs index 9ab4c7320..487dcc602 100644 --- a/Scripts/Engines/Quests/The Summoning/Items/ChylothStaff.cs +++ b/Scripts/Engines/Quests/The Summoning/Items/ChylothStaff.cs @@ -6,7 +6,7 @@ namespace Server.Engines.Quests.Doom { public class ChylothStaff : BlackStaff { - public override int LabelNumber{ get{ return 1041111; } } // a magic staff + public override int LabelNumber => 1041111; // a magic staff [Constructible] public ChylothStaff() @@ -32,4 +32,4 @@ namespace Server.Engines.Quests.Doom int version = reader.ReadInt(); } } -} \ No newline at end of file +} diff --git a/Scripts/Engines/Quests/The Summoning/Items/GoldenSkull.cs b/Scripts/Engines/Quests/The Summoning/Items/GoldenSkull.cs index 23863b7fe..f4686f677 100644 --- a/Scripts/Engines/Quests/The Summoning/Items/GoldenSkull.cs +++ b/Scripts/Engines/Quests/The Summoning/Items/GoldenSkull.cs @@ -4,7 +4,7 @@ namespace Server.Engines.Quests.Doom { public class GoldenSkull : Item { - public override int LabelNumber{ get{ return 1061619; } } // a golden skull + public override int LabelNumber => 1061619; // a golden skull [Constructible] public GoldenSkull() : base( Utility.Random( 0x1AE2, 3 ) ) @@ -32,4 +32,4 @@ namespace Server.Engines.Quests.Doom int version = reader.ReadInt(); } } -} \ No newline at end of file +} diff --git a/Scripts/Engines/Quests/The Summoning/Items/GrandGrimoire.cs b/Scripts/Engines/Quests/The Summoning/Items/GrandGrimoire.cs index 381a4b2d4..fd2fa9f09 100644 --- a/Scripts/Engines/Quests/The Summoning/Items/GrandGrimoire.cs +++ b/Scripts/Engines/Quests/The Summoning/Items/GrandGrimoire.cs @@ -4,7 +4,7 @@ namespace Server.Engines.Quests.Doom { public class GrandGrimoire : Item { - public override int LabelNumber{ get{ return 1060801; } } // The Grand Grimoire + public override int LabelNumber => 1060801; // The Grand Grimoire [Constructible] public GrandGrimoire() : base( 0xEFA ) @@ -33,4 +33,4 @@ namespace Server.Engines.Quests.Doom int version = reader.ReadInt(); } } -} \ No newline at end of file +} diff --git a/Scripts/Engines/Quests/The Summoning/Mobiles/Victoria.cs b/Scripts/Engines/Quests/The Summoning/Mobiles/Victoria.cs index d43e35e89..8887e5af5 100644 --- a/Scripts/Engines/Quests/The Summoning/Mobiles/Victoria.cs +++ b/Scripts/Engines/Quests/The Summoning/Mobiles/Victoria.cs @@ -12,7 +12,7 @@ namespace Server.Engines.Quests.Doom { public class Victoria : BaseQuester { - public override int TalkNumber{ get{ return 6159; } } // Ask about Chyloth + public override int TalkNumber => 6159; // Ask about Chyloth public override string DefaultName => "Victoria"; public override bool ClickTitle => true; public override bool IsActiveVendor => true; diff --git a/Scripts/Engines/Quests/The Summoning/Objectives.cs b/Scripts/Engines/Quests/The Summoning/Objectives.cs index d131e4020..ec5f362d8 100644 --- a/Scripts/Engines/Quests/The Summoning/Objectives.cs +++ b/Scripts/Engines/Quests/The Summoning/Objectives.cs @@ -16,11 +16,11 @@ namespace Server.Engines.Quests.Doom /* Find 1000 Daemon bones and hand them * to Victoria as you find them. */ - return 1050026; + return 1050026; } } - public override int MaxProgress{ get{ return 1000; } } + public override int MaxProgress => 1000; public CollectBonesObjective() { @@ -188,4 +188,4 @@ namespace Server.Engines.Quests.Doom writer.Write( (Item) m_CorpseWithSkull ); } } -} \ No newline at end of file +} diff --git a/Scripts/Engines/Quests/The Summoning/TheSummoningQuest.cs b/Scripts/Engines/Quests/The Summoning/TheSummoningQuest.cs index 211f3e583..ab850efc7 100644 --- a/Scripts/Engines/Quests/The Summoning/TheSummoningQuest.cs +++ b/Scripts/Engines/Quests/The Summoning/TheSummoningQuest.cs @@ -15,7 +15,7 @@ namespace Server.Engines.Quests.Doom typeof( Doom.VanquishDaemonObjective ) }; - public override Type[] TypeReferenceTable{ get{ return m_TypeReferenceTable; } } + public override Type[] TypeReferenceTable => m_TypeReferenceTable; private Victoria m_Victoria; private bool m_WaitForSummon; @@ -74,8 +74,8 @@ namespace Server.Engines.Quests.Doom } public override bool IsTutorial => false; - public override TimeSpan RestartDelay{ get{ return TimeSpan.Zero; } } - public override int Picture{ get{ return 0x15B5; } } + public override TimeSpan RestartDelay => TimeSpan.Zero; + public override int Picture => 0x15B5; // NOTE: Quest not entirely OSI-accurate: some changes made to prevent numerous OSI bugs diff --git a/Scripts/Engines/Quests/Uzeraan Turmoil/Conversations.cs b/Scripts/Engines/Quests/Uzeraan Turmoil/Conversations.cs index cfe4604e3..f30bf35fa 100644 --- a/Scripts/Engines/Quests/Uzeraan Turmoil/Conversations.cs +++ b/Scripts/Engines/Quests/Uzeraan Turmoil/Conversations.cs @@ -210,7 +210,7 @@ namespace Server.Engines.Quests.Haven new QuestItemInfo( 1023676, 0xE68 ) // glowing rune }; - public override QuestItemInfo[] Info{ get{ return m_Info; } } + public override QuestItemInfo[] Info => m_Info; public UzeraanFirstTaskConversation() { @@ -300,7 +300,7 @@ namespace Server.Engines.Quests.Haven new QuestItemInfo( 1048032, 0xE76 ) // a bag }; - public override QuestItemInfo[] Info{ get{ return m_Info; } } + public override QuestItemInfo[] Info => m_Info; public UzeraanReportConversation() { @@ -376,7 +376,7 @@ namespace Server.Engines.Quests.Haven new QuestItemInfo( 1023637, 0xE34 ) // scroll }; - public override QuestItemInfo[] Info{ get{ return m_Info; } } + public override QuestItemInfo[] Info => m_Info; public SchmendrickConversation() { @@ -438,7 +438,7 @@ namespace Server.Engines.Quests.Haven new QuestItemInfo( 1049117, 0xFC4 ) // Horn of Retreat }; - public override QuestItemInfo[] Info{ get{ return m_Info; } } + public override QuestItemInfo[] Info => m_Info; public UzeraanScrollOfPowerConversation() { @@ -546,7 +546,7 @@ namespace Server.Engines.Quests.Haven new QuestItemInfo( 1022581, 0xA22 ), // lantern }; - public override QuestItemInfo[] Info{ get{ return m_Info; } } + public override QuestItemInfo[] Info => m_Info; public UzeraanFertileDirtConversation() { diff --git a/Scripts/Engines/Quests/Uzeraan Turmoil/Items/Cannon.cs b/Scripts/Engines/Quests/Uzeraan Turmoil/Items/Cannon.cs index dd36f1019..270718996 100644 --- a/Scripts/Engines/Quests/Uzeraan Turmoil/Items/Cannon.cs +++ b/Scripts/Engines/Quests/Uzeraan Turmoil/Items/Cannon.cs @@ -19,7 +19,7 @@ namespace Server.Engines.Quests.Haven private MilitiaCanoneer m_Canoneer; [CommandProperty( AccessLevel.GameMaster )] - public CannonDirection CannonDirection { get { return m_CannonDirection; } } + public CannonDirection CannonDirection => m_CannonDirection; [CommandProperty( AccessLevel.GameMaster )] public MilitiaCanoneer Canoneer { get { return m_Canoneer; } set { m_Canoneer = value; } } @@ -95,7 +95,7 @@ namespace Server.Engines.Quests.Haven target.Damage( 9999, from ); } - public override bool HandlesOnMovement { get { return m_Canoneer != null && !m_Canoneer.Deleted && m_Canoneer.Active; } } + public override bool HandlesOnMovement => m_Canoneer != null && !m_Canoneer.Deleted && m_Canoneer.Active; public override void OnMovement( Mobile m, Point3D oldLocation ) { @@ -178,4 +178,4 @@ namespace Server.Engines.Quests.Haven int version = reader.ReadInt(); } } -} \ No newline at end of file +} diff --git a/Scripts/Engines/Quests/Uzeraan Turmoil/Items/SchmendrickScrollOfPower.cs b/Scripts/Engines/Quests/Uzeraan Turmoil/Items/SchmendrickScrollOfPower.cs index 797af2a4c..ceea04dd1 100644 --- a/Scripts/Engines/Quests/Uzeraan Turmoil/Items/SchmendrickScrollOfPower.cs +++ b/Scripts/Engines/Quests/Uzeraan Turmoil/Items/SchmendrickScrollOfPower.cs @@ -7,7 +7,7 @@ namespace Server.Engines.Quests.Haven { public class SchmendrickScrollOfPower : QuestItem { - public override int LabelNumber { get { return 1049118; } } // a scroll with ancient markings + public override int LabelNumber => 1049118; // a scroll with ancient markings public SchmendrickScrollOfPower() : base( 0xE34 ) { @@ -43,4 +43,4 @@ namespace Server.Engines.Quests.Haven int version = reader.ReadInt(); } } -} \ No newline at end of file +} diff --git a/Scripts/Engines/Quests/Uzeraan Turmoil/Mobiles/Dryad.cs b/Scripts/Engines/Quests/Uzeraan Turmoil/Mobiles/Dryad.cs index d9448852b..9a842a05a 100644 --- a/Scripts/Engines/Quests/Uzeraan Turmoil/Mobiles/Dryad.cs +++ b/Scripts/Engines/Quests/Uzeraan Turmoil/Mobiles/Dryad.cs @@ -12,7 +12,7 @@ namespace Server.Engines.Quests.Haven { public override bool IsActiveVendor => true; public override bool DisallowAllMoves => false; - public override bool ClickTitle{ get { return true; } } + public override bool ClickTitle => true; public override bool CanTeach => true; public override string DefaultName => "Anwin Brenna"; @@ -168,8 +168,8 @@ namespace Server.Engines.Quests.Haven { } - public override IShopSellInfo SellInfo { get { return m_SellInfo; } } - public override List BuyInfo { get { return m_BuyInfo; } } + public override IShopSellInfo SellInfo => m_SellInfo; + public override List BuyInfo => m_BuyInfo; public class InternalBuyInfo : List { diff --git a/Scripts/Engines/Quests/Uzeraan Turmoil/Objectives.cs b/Scripts/Engines/Quests/Uzeraan Turmoil/Objectives.cs index 8d2678037..1203854a9 100644 --- a/Scripts/Engines/Quests/Uzeraan Turmoil/Objectives.cs +++ b/Scripts/Engines/Quests/Uzeraan Turmoil/Objectives.cs @@ -38,7 +38,7 @@ namespace Server.Engines.Quests.Haven { /* Go to the shrine inside of Uzeraan's Mansion, near the front doors and * tithe at least 500 gold.

- * + * * Return to Uzeraan when you are done. */ return 1060386; @@ -103,7 +103,7 @@ namespace Server.Engines.Quests.Haven { private KillHordeMinionsStep m_Step; - public KillHordeMinionsStep Step { get { return m_Step; } } + public KillHordeMinionsStep Step => m_Step; public override object Message { @@ -114,7 +114,7 @@ namespace Server.Engines.Quests.Haven case KillHordeMinionsStep.First: /* Find the mountain pass beyond the house which lies at the * end of the runic road.

- * + * * Assist the city Militia by slaying Horde Minions */ return 1049089; @@ -267,7 +267,7 @@ namespace Server.Engines.Quests.Haven { /* It's no use... The Horde Minions are too many. * They are appearing out of nowhere.

- * + * * Return to Uzeraan and report your findings. */ return 1049091; @@ -292,7 +292,7 @@ namespace Server.Engines.Quests.Haven { /* Prepare for battle and step onto the teleporter, * located against the wall in the main hall of Uzeraan's mansion.

- * + * * Find Schmendrick within the mines. */ return 1049120; @@ -348,7 +348,7 @@ namespace Server.Engines.Quests.Haven get { /* You have obtained the scroll of power! Find your way out of the cave.

- * + * * Hand the scroll to Uzeraan (drag and drop) once you arrive in his mansion. */ return 1049324; @@ -373,7 +373,7 @@ namespace Server.Engines.Quests.Haven { /* Find the Dryad in the woods of Haven and get a patch * of fertile dirt from her.

- * + * * Use Uzeraan's teleporter to get there if necessary. */ return 1049358; @@ -397,7 +397,7 @@ namespace Server.Engines.Quests.Haven get { /* You have acquired the Fertile Dirt!

- * + * * Return to the mansion (North-East * of the Dryad's Grove) and hand it to Uzeraan. */ @@ -422,7 +422,7 @@ namespace Server.Engines.Quests.Haven get { /* Bring back a vial of blood.

- * + * * Follow the road leading north from the mansion and walk into the hut * to find the chest that contains the vial */ @@ -486,7 +486,7 @@ namespace Server.Engines.Quests.Haven get { /* You have the vial of blood!

- * + * * Return to Uzeraan's mansion and hand him the vial. */ return 1049332; @@ -528,7 +528,7 @@ namespace Server.Engines.Quests.Haven else { /* Use Uzeraan's teleporter to get to the Haunted graveyard.

- * + * * Slay the undead until you find a Daemon Bone. */ return 1049362; @@ -635,4 +635,4 @@ namespace Server.Engines.Quests.Haven System.AddConversation( new BankerConversation() ); } } -} \ No newline at end of file +} diff --git a/Scripts/Engines/Quests/Uzeraan Turmoil/UzeraanTurmoilQuest.cs b/Scripts/Engines/Quests/Uzeraan Turmoil/UzeraanTurmoilQuest.cs index 1acd07d23..3a0075b3b 100644 --- a/Scripts/Engines/Quests/Uzeraan Turmoil/UzeraanTurmoilQuest.cs +++ b/Scripts/Engines/Quests/Uzeraan Turmoil/UzeraanTurmoilQuest.cs @@ -44,7 +44,7 @@ namespace Server.Engines.Quests.Haven typeof( Haven.FewReagentsConversation ) }; - public override Type[] TypeReferenceTable{ get{ return m_TypeReferenceTable; } } + public override Type[] TypeReferenceTable => m_TypeReferenceTable; public override object Name { @@ -82,7 +82,7 @@ namespace Server.Engines.Quests.Haven } } - public override TimeSpan RestartDelay{ get{ return TimeSpan.MaxValue; } } + public override TimeSpan RestartDelay => TimeSpan.MaxValue; public override bool IsTutorial => true; public override int Picture diff --git a/Scripts/Engines/Quests/Witch Apprentice/Items/HangoverCure.cs b/Scripts/Engines/Quests/Witch Apprentice/Items/HangoverCure.cs index 4d93a054e..21bb7d61d 100644 --- a/Scripts/Engines/Quests/Witch Apprentice/Items/HangoverCure.cs +++ b/Scripts/Engines/Quests/Witch Apprentice/Items/HangoverCure.cs @@ -7,7 +7,7 @@ namespace Server.Engines.Quests.Hag { private int m_Uses; - public override int LabelNumber{ get{ return 1055060; } } // Grizelda's Extra Strength Hangover Cure + public override int LabelNumber => 1055060; // Grizelda's Extra Strength Hangover Cure [CommandProperty( AccessLevel.GameMaster )] public int Uses @@ -87,4 +87,4 @@ namespace Server.Engines.Quests.Hag } } } -} \ No newline at end of file +} diff --git a/Scripts/Engines/Quests/Witch Apprentice/Items/MagicFlute.cs b/Scripts/Engines/Quests/Witch Apprentice/Items/MagicFlute.cs index 55895aeec..7fcd8562f 100644 --- a/Scripts/Engines/Quests/Witch Apprentice/Items/MagicFlute.cs +++ b/Scripts/Engines/Quests/Witch Apprentice/Items/MagicFlute.cs @@ -7,7 +7,7 @@ namespace Server.Engines.Quests.Hag { public class MagicFlute : Item { - public override int LabelNumber{ get{ return 1055051; } } // magic flute + public override int LabelNumber => 1055051; // magic flute [Constructible] public MagicFlute() : base( 0x1421 ) @@ -74,4 +74,4 @@ namespace Server.Engines.Quests.Hag int version = reader.ReadInt(); } } -} \ No newline at end of file +} diff --git a/Scripts/Engines/Quests/Witch Apprentice/Items/MoonfireBrew.cs b/Scripts/Engines/Quests/Witch Apprentice/Items/MoonfireBrew.cs index ebe342c51..746f8550d 100644 --- a/Scripts/Engines/Quests/Witch Apprentice/Items/MoonfireBrew.cs +++ b/Scripts/Engines/Quests/Witch Apprentice/Items/MoonfireBrew.cs @@ -5,7 +5,7 @@ namespace Server.Engines.Quests.Hag { public class MoonfireBrew : Item { - public override int LabelNumber{ get{ return 1055065; } } // a bottle of magical moonfire brew + public override int LabelNumber => 1055065; // a bottle of magical moonfire brew [Constructible] public MoonfireBrew() : base( 0xF04 ) @@ -31,4 +31,4 @@ namespace Server.Engines.Quests.Hag int version = reader.ReadInt(); } } -} \ No newline at end of file +} diff --git a/Scripts/Engines/Quests/Witch Apprentice/Objectives.cs b/Scripts/Engines/Quests/Witch Apprentice/Objectives.cs index 1e82ca32d..9e2055381 100644 --- a/Scripts/Engines/Quests/Witch Apprentice/Objectives.cs +++ b/Scripts/Engines/Quests/Witch Apprentice/Objectives.cs @@ -165,7 +165,7 @@ namespace Server.Engines.Quests.Hag } } - public override int MaxProgress{ get{ return m_MaxProgress; } } + public override int MaxProgress => m_MaxProgress; public KillImpsObjective( bool init ) { @@ -473,7 +473,7 @@ namespace Server.Engines.Quests.Hag public void NextStep() { System.From.SendLocalizedMessage( 1055046 ); // You have completed your current task on the Hag's Magic Brew Recipe list. - + if ( Step < 3 ) System.AddObjective( new FindIngredientObjective( m_Ingredients ) ); else @@ -525,4 +525,4 @@ namespace Server.Engines.Quests.Hag System.AddConversation( new EndConversation() ); } } -} \ No newline at end of file +} diff --git a/Scripts/Engines/Quests/Witch Apprentice/WitchApprenticeQuest.cs b/Scripts/Engines/Quests/Witch Apprentice/WitchApprenticeQuest.cs index 569e36042..84f5d6e14 100644 --- a/Scripts/Engines/Quests/Witch Apprentice/WitchApprenticeQuest.cs +++ b/Scripts/Engines/Quests/Witch Apprentice/WitchApprenticeQuest.cs @@ -32,7 +32,7 @@ namespace Server.Engines.Quests.Hag typeof( Hag.RecentlyFinishedConversation ) }; - public override Type[] TypeReferenceTable{ get{ return m_TypeReferenceTable; } } + public override Type[] TypeReferenceTable => m_TypeReferenceTable; public override object Name { @@ -86,10 +86,10 @@ namespace Server.Engines.Quests.Hag } } - public override TimeSpan RestartDelay{ get{ return TimeSpan.FromMinutes( 5.0 ); } } + public override TimeSpan RestartDelay => TimeSpan.FromMinutes( 5.0 ); public override bool IsTutorial => false; - public override int Picture{ get{ return 0x15D3; } } + public override int Picture => 0x15D3; public WitchApprenticeQuest( PlayerMobile from ) : base( from ) { diff --git a/Scripts/Engines/RemoteAdmin/Network.cs b/Scripts/Engines/RemoteAdmin/Network.cs index 9b5b38a52..6657d6623 100644 --- a/Scripts/Engines/RemoteAdmin/Network.cs +++ b/Scripts/Engines/RemoteAdmin/Network.cs @@ -147,13 +147,13 @@ namespace Server.RemoteAdmin { Timer.DelayCall( TimeSpan.FromSeconds( 15.0 ), new TimerStateCallback( Disconnect ), state ); } - + private static void Disconnect( object state ) { m_Auth.Remove( state ); ((NetState)state).Dispose(); } - + public static void Authenticate( NetState state, PacketReader pvSrc ) { string user = pvSrc.ReadString( 30 ); @@ -181,7 +181,7 @@ namespace Server.RemoteAdmin else if ( a.AccessLevel < AccessLevel.Administrator || a.Banned ) { Console.WriteLine( "ADMIN: Account '{0}' does not have admin access. Connection Denied.", user ); - state.Send( new Login( LoginResponse.NoAccess ) ); + state.Send( new Login( LoginResponse.NoAccess ) ); DelayedDisconnect( state ); } else @@ -244,7 +244,7 @@ namespace Server.RemoteAdmin } } } - + public class EventTextWriter : System.IO.TextWriter { public delegate void OnConsoleChar( char ch ); @@ -280,6 +280,6 @@ namespace Server.RemoteAdmin m_OnLine( line ); } - public override System.Text.Encoding Encoding{ get{ return System.Text.Encoding.ASCII; } } + public override System.Text.Encoding Encoding => System.Text.Encoding.ASCII; } } diff --git a/Scripts/Engines/RemoteAdmin/RemoteAdminLogging.cs b/Scripts/Engines/RemoteAdmin/RemoteAdminLogging.cs index e8d862cf5..6b6192cf8 100644 --- a/Scripts/Engines/RemoteAdmin/RemoteAdminLogging.cs +++ b/Scripts/Engines/RemoteAdmin/RemoteAdminLogging.cs @@ -16,7 +16,7 @@ namespace Server.RemoteAdmin public static bool Enabled { get { return m_Enabled; } set { m_Enabled = value; } } - public static StreamWriter Output { get { return m_Output; } } + public static StreamWriter Output => m_Output; private static bool Initialized = false; public static void LazyInitialize() diff --git a/Scripts/Engines/Reports/Objects/Charts/BarGraph.cs b/Scripts/Engines/Reports/Objects/Charts/BarGraph.cs index 80afba920..d47fee817 100644 --- a/Scripts/Engines/Reports/Objects/Charts/BarGraph.cs +++ b/Scripts/Engines/Reports/Objects/Charts/BarGraph.cs @@ -19,7 +19,7 @@ namespace Server.Engines.Reports return new BarGraph(); } - public override PersistableType TypeID{ get{ return ThisTypeID; } } + public override PersistableType TypeID => ThisTypeID; #endregion private int m_Ticks; @@ -308,4 +308,4 @@ namespace Server.Engines.Reports return barGraph; } } -} \ No newline at end of file +} diff --git a/Scripts/Engines/Reports/Objects/Charts/ChartItem.cs b/Scripts/Engines/Reports/Objects/Charts/ChartItem.cs index 5b5193f08..85cf70b92 100644 --- a/Scripts/Engines/Reports/Objects/Charts/ChartItem.cs +++ b/Scripts/Engines/Reports/Objects/Charts/ChartItem.cs @@ -12,7 +12,7 @@ namespace Server.Engines.Reports return new ChartItem(); } - public override PersistableType TypeID{ get{ return ThisTypeID; } } + public override PersistableType TypeID => ThisTypeID; #endregion private string m_Name; @@ -43,4 +43,4 @@ namespace Server.Engines.Reports m_Value = ip.GetInt32( "v" ); } } -} \ No newline at end of file +} diff --git a/Scripts/Engines/Reports/Objects/Charts/PieChart.cs b/Scripts/Engines/Reports/Objects/Charts/PieChart.cs index 9a50e3649..7ad36deff 100644 --- a/Scripts/Engines/Reports/Objects/Charts/PieChart.cs +++ b/Scripts/Engines/Reports/Objects/Charts/PieChart.cs @@ -12,7 +12,7 @@ namespace Server.Engines.Reports return new PieChart(); } - public override PersistableType TypeID{ get{ return ThisTypeID; } } + public override PersistableType TypeID => ThisTypeID; #endregion private bool m_ShowPercents; @@ -44,4 +44,4 @@ namespace Server.Engines.Reports m_ShowPercents = ip.GetBoolean( "p" ); } } -} \ No newline at end of file +} diff --git a/Scripts/Engines/Reports/Objects/Reports/ItemValue.cs b/Scripts/Engines/Reports/Objects/Reports/ItemValue.cs index 8bc1d8a82..b88c49a8a 100644 --- a/Scripts/Engines/Reports/Objects/Reports/ItemValue.cs +++ b/Scripts/Engines/Reports/Objects/Reports/ItemValue.cs @@ -12,7 +12,7 @@ namespace Server.Engines.Reports return new ItemValue(); } - public override PersistableType TypeID{ get{ return ThisTypeID; } } + public override PersistableType TypeID => ThisTypeID; #endregion private string m_Value; @@ -50,4 +50,4 @@ namespace Server.Engines.Reports Utility.Intern( ref m_Value ); } } -} \ No newline at end of file +} diff --git a/Scripts/Engines/Reports/Objects/Reports/Report.cs b/Scripts/Engines/Reports/Objects/Reports/Report.cs index 972e30e15..5a086a5b9 100644 --- a/Scripts/Engines/Reports/Objects/Reports/Report.cs +++ b/Scripts/Engines/Reports/Objects/Reports/Report.cs @@ -12,7 +12,7 @@ namespace Server.Engines.Reports return new Report(); } - public override PersistableType TypeID{ get{ return ThisTypeID; } } + public override PersistableType TypeID => ThisTypeID; #endregion private string m_Name; @@ -71,4 +71,4 @@ namespace Server.Engines.Reports } } } -} \ No newline at end of file +} diff --git a/Scripts/Engines/Reports/Objects/Reports/ReportColumn.cs b/Scripts/Engines/Reports/Objects/Reports/ReportColumn.cs index de054599c..1bd3e8497 100644 --- a/Scripts/Engines/Reports/Objects/Reports/ReportColumn.cs +++ b/Scripts/Engines/Reports/Objects/Reports/ReportColumn.cs @@ -12,7 +12,7 @@ namespace Server.Engines.Reports return new ReportColumn(); } - public override PersistableType TypeID{ get{ return ThisTypeID; } } + public override PersistableType TypeID => ThisTypeID; #endregion private string m_Width; @@ -52,4 +52,4 @@ namespace Server.Engines.Reports m_Name = Utility.Intern( ip.GetString( "n" ) ); } } -} \ No newline at end of file +} diff --git a/Scripts/Engines/Reports/Objects/Reports/ReportItem.cs b/Scripts/Engines/Reports/Objects/Reports/ReportItem.cs index 09eabe55a..02d348bb7 100644 --- a/Scripts/Engines/Reports/Objects/Reports/ReportItem.cs +++ b/Scripts/Engines/Reports/Objects/Reports/ReportItem.cs @@ -12,7 +12,7 @@ namespace Server.Engines.Reports return new ReportItem(); } - public override PersistableType TypeID{ get{ return ThisTypeID; } } + public override PersistableType TypeID => ThisTypeID; #endregion private ItemValueCollection m_Values; @@ -36,4 +36,4 @@ namespace Server.Engines.Reports m_Values.Add( ip.GetChild() as ItemValue ); } } -} \ No newline at end of file +} diff --git a/Scripts/Engines/Reports/Objects/Snapshots/Snapshot.cs b/Scripts/Engines/Reports/Objects/Snapshots/Snapshot.cs index 10944f700..59f63a804 100644 --- a/Scripts/Engines/Reports/Objects/Snapshots/Snapshot.cs +++ b/Scripts/Engines/Reports/Objects/Snapshots/Snapshot.cs @@ -13,7 +13,7 @@ namespace Server.Engines.Reports return new Snapshot(); } - public override PersistableType TypeID{ get{ return ThisTypeID; } } + public override PersistableType TypeID => ThisTypeID; #endregion private DateTime m_TimeStamp; @@ -49,4 +49,4 @@ namespace Server.Engines.Reports m_Children.Add( ip.GetChild() ); } } -} \ No newline at end of file +} diff --git a/Scripts/Engines/Reports/Objects/Snapshots/SnapshotHistory.cs b/Scripts/Engines/Reports/Objects/Snapshots/SnapshotHistory.cs index b1144d156..ffb8be973 100644 --- a/Scripts/Engines/Reports/Objects/Snapshots/SnapshotHistory.cs +++ b/Scripts/Engines/Reports/Objects/Snapshots/SnapshotHistory.cs @@ -14,7 +14,7 @@ namespace Server.Engines.Reports return new SnapshotHistory(); } - public override PersistableType TypeID{ get{ return ThisTypeID; } } + public override PersistableType TypeID => ThisTypeID; #endregion private SnapshotCollection m_Snapshots; @@ -62,4 +62,4 @@ namespace Server.Engines.Reports m_Snapshots.Add( ip.GetChild() as Snapshot ); } } -} \ No newline at end of file +} diff --git a/Scripts/Engines/Reports/Objects/Staffing/PageInfo.cs b/Scripts/Engines/Reports/Objects/Staffing/PageInfo.cs index 734f43c69..bcfdd76b9 100644 --- a/Scripts/Engines/Reports/Objects/Staffing/PageInfo.cs +++ b/Scripts/Engines/Reports/Objects/Staffing/PageInfo.cs @@ -25,7 +25,7 @@ namespace Server.Engines.Reports return new PageInfo(); } - public override PersistableType TypeID{ get{ return ThisTypeID; } } + public override PersistableType TypeID => ThisTypeID; #endregion private StaffHistory m_History; @@ -140,7 +140,7 @@ namespace Server.Engines.Reports { string resolvedBy; DateTime timeResolved; - PageResolution res = GetResolution( out resolvedBy, out timeResolved ); + PageResolution res = GetResolution( out resolvedBy, out timeResolved ); if ( m_History != null && IsStaffResolution( res ) ) Resolver = m_History.GetStaffInfo( resolvedBy ); @@ -254,4 +254,4 @@ namespace Server.Engines.Reports m_Responses.Add( ip.GetChild() as ResponseInfo ); } } -} \ No newline at end of file +} diff --git a/Scripts/Engines/Reports/Objects/Staffing/QueueStatus.cs b/Scripts/Engines/Reports/Objects/Staffing/QueueStatus.cs index b9e9e276e..04b40e0c7 100644 --- a/Scripts/Engines/Reports/Objects/Staffing/QueueStatus.cs +++ b/Scripts/Engines/Reports/Objects/Staffing/QueueStatus.cs @@ -16,7 +16,7 @@ namespace Server.Engines.Reports return new QueueStatus(); } - public override PersistableType TypeID{ get{ return ThisTypeID; } } + public override PersistableType TypeID => ThisTypeID; #endregion private DateTime m_TimeStamp; @@ -47,4 +47,4 @@ namespace Server.Engines.Reports m_Count = ip.GetInt32( "c" ); } } -} \ No newline at end of file +} diff --git a/Scripts/Engines/Reports/Objects/Staffing/ResponseInfo.cs b/Scripts/Engines/Reports/Objects/Staffing/ResponseInfo.cs index 5851f6a88..c291f763b 100644 --- a/Scripts/Engines/Reports/Objects/Staffing/ResponseInfo.cs +++ b/Scripts/Engines/Reports/Objects/Staffing/ResponseInfo.cs @@ -16,7 +16,7 @@ namespace Server.Engines.Reports return new ResponseInfo(); } - public override PersistableType TypeID{ get{ return ThisTypeID; } } + public override PersistableType TypeID => ThisTypeID; #endregion private DateTime m_TimeStamp; @@ -56,4 +56,4 @@ namespace Server.Engines.Reports m_Message = ip.GetString( "m" ); } } -} \ No newline at end of file +} diff --git a/Scripts/Engines/Reports/Objects/Staffing/StaffHistory.cs b/Scripts/Engines/Reports/Objects/Staffing/StaffHistory.cs index 8e548a285..7aac62525 100644 --- a/Scripts/Engines/Reports/Objects/Staffing/StaffHistory.cs +++ b/Scripts/Engines/Reports/Objects/Staffing/StaffHistory.cs @@ -15,7 +15,7 @@ namespace Server.Engines.Reports return new StaffHistory(); } - public override PersistableType TypeID{ get{ return ThisTypeID; } } + public override PersistableType TypeID => ThisTypeID; #endregion private PageInfoCollection m_Pages; @@ -286,7 +286,7 @@ namespace Server.Engines.Reports { int[] totals = new int[24]; int[] counts = new int[24]; - + DateTime[] dates = new DateTime[24]; DateTime max = DateTime.UtcNow; @@ -403,4 +403,4 @@ namespace Server.Engines.Reports return new PieChart[]{ staffChart, resChart }; } } -} \ No newline at end of file +} diff --git a/Scripts/Engines/Spawner/Spawner.cs b/Scripts/Engines/Spawner/Spawner.cs index 58d3d3958..e12d33900 100644 --- a/Scripts/Engines/Spawner/Spawner.cs +++ b/Scripts/Engines/Spawner/Spawner.cs @@ -28,7 +28,7 @@ namespace Server.Mobiles private bool m_Group; private WayPoint m_WayPoint; - public override string DefaultName{ get{ return "Spawner"; } } + public override string DefaultName => "Spawner"; public bool IsFull{ get{ return ( m_Spawned != null && m_Spawned.Count >= m_Count ); } } public bool IsEmpty{ get{ return ( m_Spawned != null && m_Spawned.Count == 0 ); } } @@ -735,8 +735,7 @@ namespace Server.Mobiles if ( spawn != null ) { - SpawnerEntry entry; - m_Spawned.TryGetValue( spawn, out entry ); + m_Spawned.TryGetValue( spawn, out SpawnerEntry entry ); if ( entry != null ) entry.Spawned.Remove( spawn ); @@ -1118,7 +1117,7 @@ namespace Server.Mobiles public EntryFlags Valid{ get{ return m_Valid; } set{ m_Valid = value; } } - public List Spawned{ get { return m_Spawned; } } + public List Spawned => m_Spawned; public bool IsFull{ get{ return m_Spawned.Count >= m_SpawnedMaxCount; } } public SpawnerEntry( string name, int probability, int maxcount ) diff --git a/Scripts/Engines/Treasures of Tokuno/BasePigmentsOfTokuno.cs b/Scripts/Engines/Treasures of Tokuno/BasePigmentsOfTokuno.cs index 25e6e02d8..a5ba9c172 100644 --- a/Scripts/Engines/Treasures of Tokuno/BasePigmentsOfTokuno.cs +++ b/Scripts/Engines/Treasures of Tokuno/BasePigmentsOfTokuno.cs @@ -59,7 +59,7 @@ namespace Server.Items typeof( ShaminoCrossbow ) }; - public override int LabelNumber { get { return 1070933; } } // Pigments of Tokuno + public override int LabelNumber => 1070933; // Pigments of Tokuno private int m_UsesRemaining; private TextDefinition m_Label; diff --git a/Scripts/Engines/Treasures of Tokuno/GreaterArtifacts.cs b/Scripts/Engines/Treasures of Tokuno/GreaterArtifacts.cs index 2890f37f9..ef3211325 100644 --- a/Scripts/Engines/Treasures of Tokuno/GreaterArtifacts.cs +++ b/Scripts/Engines/Treasures of Tokuno/GreaterArtifacts.cs @@ -7,13 +7,13 @@ namespace Server.Items { public class DarkenedSky : Kama { - public override int InitMinHits { get { return 255; } } - public override int InitMaxHits { get { return 255; } } + public override int InitMinHits => 255; + public override int InitMaxHits => 255; - public override int LabelNumber { get { return 1070966; } } // Darkened Sky + public override int LabelNumber => 1070966; // Darkened Sky [Constructible] - public DarkenedSky() : base() + public DarkenedSky() { WeaponAttributes.HitLightning = 60; Attributes.WeaponSpeed = 25; @@ -48,19 +48,19 @@ namespace Server.Items public class KasaOfTheRajin : Kasa { - public override int LabelNumber { get { return 1070969; } } // Kasa of the Raj-in + public override int LabelNumber => 1070969; // Kasa of the Raj-in - public override int BasePhysicalResistance { get { return 12; } } - public override int BaseFireResistance { get { return 17; } } - public override int BaseColdResistance { get { return 21; } } - public override int BasePoisonResistance { get { return 17; } } - public override int BaseEnergyResistance { get { return 17; } } + public override int BasePhysicalResistance => 12; + public override int BaseFireResistance => 17; + public override int BaseColdResistance => 21; + public override int BasePoisonResistance => 17; + public override int BaseEnergyResistance => 17; - public override int InitMinHits { get { return 255; } } - public override int InitMaxHits { get { return 255; } } + public override int InitMinHits => 255; + public override int InitMaxHits => 255; [Constructible] - public KasaOfTheRajin() : base() + public KasaOfTheRajin() { Attributes.SpellDamage = 12; } @@ -96,16 +96,16 @@ namespace Server.Items public class RuneBeetleCarapace : PlateDo { - public override int InitMinHits { get { return 255; } } - public override int InitMaxHits { get { return 255; } } + public override int InitMinHits => 255; + public override int InitMaxHits => 255; - public override int LabelNumber{ get{ return 1070968; } } // Rune Beetle Carapace + public override int LabelNumber => 1070968; // Rune Beetle Carapace - public override int BaseColdResistance { get { return 14; } } - public override int BaseEnergyResistance { get { return 14; } } + public override int BaseColdResistance => 14; + public override int BaseEnergyResistance => 14; [Constructible] - public RuneBeetleCarapace() : base() + public RuneBeetleCarapace() { Attributes.BonusMana = 10; Attributes.RegenMana = 3; @@ -136,17 +136,17 @@ namespace Server.Items public class Stormgrip : LeatherNinjaMitts { - public override int InitMinHits { get { return 255; } } - public override int InitMaxHits { get { return 255; } } + public override int InitMinHits => 255; + public override int InitMaxHits => 255; - public override int LabelNumber{ get{ return 1070970; } } // Stormgrip + public override int LabelNumber => 1070970; // Stormgrip - public override int BasePhysicalResistance { get { return 10; } } - public override int BaseColdResistance { get { return 18; } } - public override int BaseEnergyResistance { get { return 18; } } + public override int BasePhysicalResistance => 10; + public override int BaseColdResistance => 18; + public override int BaseEnergyResistance => 18; [Constructible] - public Stormgrip() : base() + public Stormgrip() { Attributes.BonusInt = 8; Attributes.Luck = 125; @@ -175,13 +175,13 @@ namespace Server.Items public class SwordOfTheStampede : NoDachi { - public override int InitMinHits { get { return 255; } } - public override int InitMaxHits { get { return 255; } } + public override int InitMinHits => 255; + public override int InitMaxHits => 255; - public override int LabelNumber { get { return 1070964; } } // Sword of the Stampede + public override int LabelNumber => 1070964; // Sword of the Stampede [Constructible] - public SwordOfTheStampede() : base() + public SwordOfTheStampede() { WeaponAttributes.HitHarm = 100; Attributes.AttackChance = 10; @@ -216,13 +216,13 @@ namespace Server.Items public class SwordsOfProsperity : Daisho { - public override int InitMinHits { get { return 255; } } - public override int InitMaxHits { get { return 255; } } + public override int InitMinHits => 255; + public override int InitMaxHits => 255; - public override int LabelNumber { get { return 1070963; } } // Swords of Prosperity + public override int LabelNumber => 1070963; // Swords of Prosperity [Constructible] - public SwordsOfProsperity() : base() + public SwordsOfProsperity() { WeaponAttributes.MageWeapon = 30; Attributes.SpellChanneling = 1; @@ -258,13 +258,13 @@ namespace Server.Items public class TheHorselord : Yumi { - public override int InitMinHits { get { return 255; } } - public override int InitMaxHits { get { return 255; } } + public override int InitMinHits => 255; + public override int InitMaxHits => 255; - public override int LabelNumber { get { return 1070967; } } // The Horselord + public override int LabelNumber => 1070967; // The Horselord [Constructible] - public TheHorselord() : base() + public TheHorselord() { Attributes.BonusDex = 5; Attributes.RegenMana = 1; @@ -296,10 +296,10 @@ namespace Server.Items public class TomeOfLostKnowledge : Spellbook { - public override int LabelNumber { get { return 1070971; } } // Tome of Lost Knowledge + public override int LabelNumber => 1070971; // Tome of Lost Knowledge [Constructible] - public TomeOfLostKnowledge() : base() + public TomeOfLostKnowledge() { LootType = LootType.Regular; Hue = 0x530; @@ -331,10 +331,10 @@ namespace Server.Items public class WindsEdge : Tessen { - public override int LabelNumber { get { return 1070965; } } // Wind's Edge + public override int LabelNumber => 1070965; // Wind's Edge [Constructible] - public WindsEdge() : base() + public WindsEdge() { WeaponAttributes.HitLeechMana = 40; @@ -368,8 +368,8 @@ namespace Server.Items int version = reader.ReadInt(); } - public override int InitMinHits { get { return 255; } } - public override int InitMaxHits { get { return 255; } } + public override int InitMinHits => 255; + public override int InitMaxHits => 255; } public enum PigmentType @@ -422,14 +422,14 @@ namespace Server.Items new int[]{ /*PigmentType.FadedRose,*/ 0x97B, 1079586 }, new int[]{ /*PigmentType.DeepRose,*/ 0x97E, 1079587 } }; - + public static int[] GetInfo( PigmentType type ) { int v = (int)type; if( v < 0 || v >= m_Table.Length ) v = 0; - + return m_Table[v]; } @@ -442,7 +442,7 @@ namespace Server.Items set { m_Type = value; - + int v = (int)m_Type; if ( v >= 0 && v < m_Table.Length ) @@ -457,8 +457,8 @@ namespace Server.Items } } } - - public override int LabelNumber { get { return 1070933; } } // Pigments of Tokuno + + public override int LabelNumber => 1070933; // Pigments of Tokuno [Constructible] public PigmentsOfTokuno() : this( PigmentType.None, 10 ) @@ -495,7 +495,7 @@ namespace Server.Items base.Deserialize( reader ); int version = ( InheritsItem ? 0 : reader.ReadInt() ); // Required for BasePigmentsOfTokuno insertion - + switch ( version ) { case 1: Type = (PigmentType)reader.ReadEncodedInt(); break; @@ -503,4 +503,4 @@ namespace Server.Items } } } -} \ No newline at end of file +} diff --git a/Scripts/Engines/Treasures of Tokuno/LesserArtifacts.cs b/Scripts/Engines/Treasures of Tokuno/LesserArtifacts.cs index 55c108099..ee1c8c0e7 100644 --- a/Scripts/Engines/Treasures of Tokuno/LesserArtifacts.cs +++ b/Scripts/Engines/Treasures of Tokuno/LesserArtifacts.cs @@ -7,14 +7,14 @@ namespace Server.Items { public class AncientFarmersKasa : Kasa { - public override int LabelNumber{ get{ return 1070922; } } // Ancient Farmer's Kasa - public override int BaseColdResistance { get { return 19; } } + public override int LabelNumber => 1070922; // Ancient Farmer's Kasa + public override int BaseColdResistance => 19; - public override int InitMinHits{ get{ return 255; } } - public override int InitMaxHits{ get { return 255; } } + public override int InitMinHits => 255; + public override int InitMaxHits => 255; [Constructible] - public AncientFarmersKasa() : base() + public AncientFarmersKasa() { Attributes.BonusStr = 5; Attributes.BonusStam = 5; @@ -33,7 +33,7 @@ namespace Server.Items writer.Write( (int) 2 ); } - + public override void Deserialize(GenericReader reader) { base.Deserialize( reader ); @@ -51,18 +51,18 @@ namespace Server.Items } } - public class AncientSamuraiDo : PlateDo + public class AncientSamuraiDo : PlateDo { - public override int LabelNumber { get { return 1070926; } } // Ancient Samurai Do + public override int LabelNumber => 1070926; // Ancient Samurai Do - public override int BasePhysicalResistance { get { return 15; } } - public override int BaseFireResistance { get { return 12; } } - public override int BaseColdResistance { get { return 10; } } - public override int BasePoisonResistance { get { return 11; } } - public override int BaseEnergyResistance { get { return 8; } } + public override int BasePhysicalResistance => 15; + public override int BaseFireResistance => 12; + public override int BaseColdResistance => 10; + public override int BasePoisonResistance => 11; + public override int BaseEnergyResistance => 8; [Constructible] - public AncientSamuraiDo() : base() + public AncientSamuraiDo() { ArmorAttributes.LowerStatReq = 100; ArmorAttributes.MageArmor = 1; @@ -87,20 +87,20 @@ namespace Server.Items int version = reader.ReadInt(); } - public override int InitMinHits { get { return 255; } } - public override int InitMaxHits { get { return 255; } } + public override int InitMinHits => 255; + public override int InitMaxHits => 255; } public class ArmsOfTacticalExcellence : LeatherHiroSode { - public override int LabelNumber { get { return 1070921; } } // Arms of Tactical Excellence + public override int LabelNumber => 1070921; // Arms of Tactical Excellence - public override int BaseFireResistance { get { return 9; } } - public override int BaseColdResistance { get { return 13; } } - public override int BasePoisonResistance { get { return 8; } } + public override int BaseFireResistance => 9; + public override int BaseColdResistance => 13; + public override int BasePoisonResistance => 8; [Constructible] - public ArmsOfTacticalExcellence() : base() + public ArmsOfTacticalExcellence() { Attributes.BonusDex = 5; SkillBonuses.SetValues( 0, SkillName.Tactics, 12.0 ); @@ -124,25 +124,25 @@ namespace Server.Items int version = reader.ReadInt(); } - public override int InitMinHits { get { return 255; } } - public override int InitMaxHits { get { return 255; } } + public override int InitMinHits => 255; + public override int InitMaxHits => 255; } public class BlackLotusHood : ClothNinjaHood { - public override int LabelNumber { get { return 1070919; } } // Black Lotus Hood + public override int LabelNumber => 1070919; // Black Lotus Hood - public override int BasePhysicalResistance { get { return 0; } } - public override int BaseFireResistance { get { return 11; } } - public override int BaseColdResistance { get { return 15; } } - public override int BasePoisonResistance { get { return 11; } } - public override int BaseEnergyResistance { get { return 11; } } + public override int BasePhysicalResistance => 0; + public override int BaseFireResistance => 11; + public override int BaseColdResistance => 15; + public override int BasePoisonResistance => 11; + public override int BaseEnergyResistance => 11; - public override int InitMinHits { get { return 255; } } - public override int InitMaxHits { get { return 255; } } + public override int InitMinHits => 255; + public override int InitMaxHits => 255; [Constructible] - public BlackLotusHood() : base() + public BlackLotusHood() { Attributes.LowerManaCost = 6; Attributes.AttackChance = 6; @@ -176,12 +176,12 @@ namespace Server.Items public class DaimyosHelm : PlateBattleKabuto { - public override int LabelNumber { get { return 1070920; } } // Daimyo's Helm + public override int LabelNumber => 1070920; // Daimyo's Helm - public override int BaseColdResistance { get { return 10; } } + public override int BaseColdResistance => 10; [Constructible] - public DaimyosHelm() : base() + public DaimyosHelm() { ArmorAttributes.LowerStatReq = 100; ArmorAttributes.MageArmor = 1; @@ -207,16 +207,16 @@ namespace Server.Items int version = reader.ReadInt(); } - public override int InitMinHits { get { return 255; } } - public override int InitMaxHits { get { return 255; } } + public override int InitMinHits => 255; + public override int InitMaxHits => 255; } public class DemonForks : Sai { - public override int LabelNumber{ get{ return 1070917; } } // Demon Forks + public override int LabelNumber => 1070917; // Demon Forks [Constructible] - public DemonForks() : base() + public DemonForks() { WeaponAttributes.ResistFireBonus = 10; WeaponAttributes.ResistPoisonBonus = 10; @@ -244,16 +244,16 @@ namespace Server.Items int version = reader.ReadInt(); } - public override int InitMinHits { get { return 255; } } - public override int InitMaxHits { get { return 255; } } + public override int InitMinHits => 255; + public override int InitMaxHits => 255; } public class DragonNunchaku : Nunchaku { - public override int LabelNumber{ get{ return 1070914; } } // Dragon Nunchaku + public override int LabelNumber => 1070914; // Dragon Nunchaku [Constructible] - public DragonNunchaku() : base() + public DragonNunchaku() { WeaponAttributes.ResistFireBonus = 5; WeaponAttributes.SelfRepair = 3; @@ -281,16 +281,16 @@ namespace Server.Items int version = reader.ReadInt(); } - public override int InitMinHits { get { return 255; } } - public override int InitMaxHits { get { return 255; } } + public override int InitMinHits => 255; + public override int InitMaxHits => 255; } public class Exiler : Tetsubo { - public override int LabelNumber{ get{ return 1070913; } } // Exiler + public override int LabelNumber => 1070913; // Exiler [Constructible] - public Exiler() : base() + public Exiler() { WeaponAttributes.HitDispel = 33; Slayer = SlayerName.Exorcism; @@ -325,18 +325,18 @@ namespace Server.Items int version = reader.ReadInt(); } - public override int InitMinHits { get { return 255; } } - public override int InitMaxHits { get { return 255; } } + public override int InitMinHits => 255; + public override int InitMaxHits => 255; } public class GlovesOfTheSun : LeatherNinjaMitts { - public override int LabelNumber { get { return 1070924; } } // Gloves of the Sun + public override int LabelNumber => 1070924; // Gloves of the Sun - public override int BaseFireResistance { get { return 24; } } + public override int BaseFireResistance => 24; [Constructible] - public GlovesOfTheSun() : base() + public GlovesOfTheSun() { Attributes.RegenHits = 2; Attributes.NightSight = 1; @@ -362,16 +362,16 @@ namespace Server.Items int version = reader.ReadInt(); } - public override int InitMinHits { get { return 255; } } - public override int InitMaxHits { get { return 255; } } + public override int InitMinHits => 255; + public override int InitMaxHits => 255; } public class HanzosBow : Yumi { - public override int LabelNumber { get { return 1070918; } } // Hanzo's Bow + public override int LabelNumber => 1070918; // Hanzo's Bow [Constructible] - public HanzosBow() : base() + public HanzosBow() { WeaponAttributes.HitLeechHits = 40; WeaponAttributes.SelfRepair = 3; @@ -399,19 +399,19 @@ namespace Server.Items int version = reader.ReadInt(); } - public override int InitMinHits { get { return 255; } } - public override int InitMaxHits { get { return 255; } } + public override int InitMinHits => 255; + public override int InitMaxHits => 255; } public class LegsOfStability : PlateSuneate { - public override int LabelNumber { get { return 1070925; } } // Legs of Stability + public override int LabelNumber => 1070925; // Legs of Stability - public override int BasePhysicalResistance { get { return 20; } } - public override int BasePoisonResistance { get { return 18; } } + public override int BasePhysicalResistance => 20; + public override int BasePoisonResistance => 18; [Constructible] - public LegsOfStability() : base() + public LegsOfStability() { Attributes.BonusStam = 5; @@ -438,16 +438,16 @@ namespace Server.Items int version = reader.ReadInt(); } - public override int InitMinHits { get { return 255; } } - public override int InitMaxHits { get { return 255; } } + public override int InitMinHits => 255; + public override int InitMaxHits => 255; } public class PeasantsBokuto : Bokuto { - public override int LabelNumber { get { return 1070912; } } // Peasant's Bokuto + public override int LabelNumber => 1070912; // Peasant's Bokuto [Constructible] - public PeasantsBokuto() : base() + public PeasantsBokuto() { WeaponAttributes.SelfRepair = 3; WeaponAttributes.HitLowerDefend = 30; @@ -475,16 +475,16 @@ namespace Server.Items int version = reader.ReadInt(); } - public override int InitMinHits { get { return 255; } } - public override int InitMaxHits { get { return 255; } } + public override int InitMinHits => 255; + public override int InitMaxHits => 255; } public class PilferedDancerFans : Tessen { - public override int LabelNumber { get { return 1070916; } } // Pilfered Dancer Fans + public override int LabelNumber => 1070916; // Pilfered Dancer Fans [Constructible] - public PilferedDancerFans() : base() + public PilferedDancerFans() { Attributes.WeaponDamage = 20; Attributes.WeaponSpeed = 20; @@ -511,16 +511,16 @@ namespace Server.Items int version = reader.ReadInt(); } - public override int InitMinHits { get { return 255; } } - public override int InitMaxHits { get { return 255; } } + public override int InitMinHits => 255; + public override int InitMaxHits => 255; } public class TheDestroyer : NoDachi { - public override int LabelNumber { get { return 1070915; } } // The Destroyer + public override int LabelNumber => 1070915; // The Destroyer [Constructible] - public TheDestroyer() : base() + public TheDestroyer() { WeaponAttributes.HitLeechStam = 40; @@ -547,16 +547,16 @@ namespace Server.Items int version = reader.ReadInt(); } - public override int InitMinHits { get { return 255; } } - public override int InitMaxHits { get { return 255; } } + public override int InitMinHits => 255; + public override int InitMaxHits => 255; } public class TomeOfEnlightenment : Spellbook { - public override int LabelNumber { get { return 1070934; } } // Tome of Enlightenment + public override int LabelNumber => 1070934; // Tome of Enlightenment [Constructible] - public TomeOfEnlightenment() : base() + public TomeOfEnlightenment() { LootType = LootType.Regular; Hue = 0x455; @@ -584,19 +584,19 @@ namespace Server.Items int version = reader.ReadInt(); } } - + public class LeurociansMempoOfFortune : LeatherMempo { - public override int LabelNumber { get { return 1071460; } } // Leurocian's mempo of fortune + public override int LabelNumber => 1071460; // Leurocian's mempo of fortune + + public override int BasePhysicalResistance => 15; + public override int BaseFireResistance => 10; + public override int BaseColdResistance => 10; + public override int BasePoisonResistance => 10; + public override int BaseEnergyResistance => 15; - public override int BasePhysicalResistance{ get{ return 15; } } - public override int BaseFireResistance{ get{ return 10; } } - public override int BaseColdResistance{ get{ return 10; } } - public override int BasePoisonResistance{ get{ return 10; } } - public override int BaseEnergyResistance{ get{ return 15; } } - [Constructible] - public LeurociansMempoOfFortune() : base() + public LeurociansMempoOfFortune() { LootType = LootType.Regular; Hue = 0x501; @@ -622,8 +622,8 @@ namespace Server.Items int version = reader.ReadInt(); } - public override int InitMinHits { get { return 255; } } - public override int InitMaxHits { get { return 255; } } + public override int InitMinHits => 255; + public override int InitMaxHits => 255; } //Non weapon/armor ones: @@ -639,7 +639,7 @@ namespace Server.Items "Emiko", "Fumiyo", "Gennai", - "Gennosuke", + "Gennosuke", "Genjo", "Hamato", "Harumi", @@ -669,7 +669,7 @@ namespace Server.Items "Zeshin" }; - public static string[] Names { get { return m_Names; } } + public static string[] Names => m_Names; private string m_UrnName; @@ -680,7 +680,7 @@ namespace Server.Items set { m_UrnName = value; } } - public override int LabelNumber { get { return 1071014; } } // Ancient Urn + public override int LabelNumber => 1071014; // Ancient Urn [Constructible] public AncientUrn( string urnName ) : base( 0x241D ) @@ -739,7 +739,7 @@ namespace Server.Items set { m_SwordsName = value; } } - public override int LabelNumber { get { return 1071015; } } // Honorable Swords + public override int LabelNumber => 1071015; // Honorable Swords [Constructible] public HonorableSwords( string swordsName ) : base( 0x2853 ) @@ -791,8 +791,8 @@ namespace Server.Items [Flippable( 0x2811, 0x2812 )] public class ChestOfHeirlooms : LockableContainer { - public override int LabelNumber{ get{ return 1070937; } } // Chest of heirlooms - + public override int LabelNumber => 1070937; // Chest of heirlooms + [Constructible] public ChestOfHeirlooms() : base( 0x2811 ) { @@ -800,21 +800,21 @@ namespace Server.Items LockLevel = 95; MaxLockLevel = 140; RequiredSkill = 95; - + TrapType = TrapType.ExplosionTrap; TrapLevel = 10; TrapPower = 100; - + GumpID = 0x10B; - + for ( int i = 0; i < 10; ++i ) { Item item = Loot.ChestOfHeirloomsContains(); - + int attributeCount = Utility.RandomMinMax( 1, 5 ); int min = 20; int max = 80; - + if ( item is BaseWeapon ) { BaseWeapon weapon = (BaseWeapon)item; @@ -844,7 +844,7 @@ namespace Server.Items BaseRunicTool.ApplyAttributesTo( (BaseHat)item, attributeCount, min, max ); else if( item is BaseJewel && Core.AOS ) BaseRunicTool.ApplyAttributesTo( (BaseJewel)item, attributeCount, min, max ); - + DropItem( item ); } } @@ -870,18 +870,18 @@ namespace Server.Items public class FluteOfRenewal : BambooFlute { - public override int LabelNumber { get { return 1070927; } } // Flute of Renewal + public override int LabelNumber => 1070927; // Flute of Renewal [Constructible] - public FluteOfRenewal() : base() + public FluteOfRenewal() { Slayer = SlayerGroup.Groups[Utility.Random( SlayerGroup.Groups.Length - 1 )].Super.Name; //-1 to exclude Fey slayer. Try to confrim no fey slayer on this on OSI ReplenishesCharges = true; } - public override int InitMinUses { get { return 300; } } - public override int InitMaxUses { get { return 300; } } + public override int InitMinUses => 300; + public override int InitMaxUses => 300; public FluteOfRenewal( Serial serial ) : base( serial ) { @@ -904,7 +904,7 @@ namespace Server.Items Slayer = SlayerGroup.Groups[Utility.Random( SlayerGroup.Groups.Length - 1 )].Super.Name; } } - + public enum LesserPigmentType { None, @@ -922,7 +922,7 @@ namespace Server.Items public class LesserPigmentsOfTokuno : BasePigmentsOfTokuno { - + private static int[][] m_Table = new int[][] { // Hue, Label @@ -938,14 +938,14 @@ namespace Server.Items new int[]{ /*PigmentType.DeepBrown,*/ 0x3F0, 1071452 }, new int[]{ /*PigmentType.BurntBrown,*/ 0x41A, 1071453 } }; - + public static int[] GetInfo( LesserPigmentType type ) { int v = (int)type; if( v < 0 || v >= m_Table.Length ) v = 0; - + return m_Table[v]; } @@ -958,7 +958,7 @@ namespace Server.Items set { m_Type = value; - + int v = (int)m_Type; if ( v >= 0 && v < m_Table.Length ) @@ -978,7 +978,7 @@ namespace Server.Items public LesserPigmentsOfTokuno() : this( (LesserPigmentType)Utility.Random(0,11) ) { } - + [Constructible] public LesserPigmentsOfTokuno( LesserPigmentType type ) : base( 1 ) { @@ -1004,7 +1004,7 @@ namespace Server.Items base.Deserialize( reader ); int version = ( InheritsItem ? 0 : reader.ReadInt() ); // Required for BasePigmentsOfTokuno insertion - + switch ( version ) { case 1: Type = (LesserPigmentType)reader.ReadEncodedInt(); break; @@ -1021,11 +1021,11 @@ namespace Server.Items RandomHue(); Label = -1; } - + public MetalPigmentsOfTokuno( Serial serial ) : base( serial ) { } - + public void RandomHue() { int a = Utility.Random(0,30); @@ -1049,4 +1049,4 @@ namespace Server.Items int version = ( InheritsItem ? 0 : reader.ReadInt() ); // Required for BasePigmentsOfTokuno insertion } } -} \ No newline at end of file +} diff --git a/Scripts/Engines/Treasures of Tokuno/TreasuresOfTokuno.cs b/Scripts/Engines/Treasures of Tokuno/TreasuresOfTokuno.cs index 242dafe00..cd830c8ce 100644 --- a/Scripts/Engines/Treasures of Tokuno/TreasuresOfTokuno.cs +++ b/Scripts/Engines/Treasures of Tokuno/TreasuresOfTokuno.cs @@ -31,7 +31,7 @@ namespace Server.Misc typeof( LeurociansMempoOfFortune ), typeof( LesserPigmentsOfTokuno ), typeof( MetalPigmentsOfTokuno ), typeof( ChestOfHeirlooms ) }; - public static Type[] LesserArtifactsTotal { get { return m_LesserArtifactsTotal; } } + public static Type[] LesserArtifactsTotal => m_LesserArtifactsTotal; private static TreasuresOfTokunoEra _DropEra = TreasuresOfTokunoEra.None; private static TreasuresOfTokunoEra _RewardEra = TreasuresOfTokunoEra.ToTOne; @@ -409,7 +409,7 @@ namespace Server.Gumps { private Type m_Type; - public Type Type { get { return m_Type; } } + public Type Type => m_Type; public TypeTileButtonInfo( Type type, int itemID, int hue, TextDefinition label, int localizedToolTip ) : base( itemID, hue, label, localizedToolTip ) { diff --git a/Scripts/Engines/VeteranRewards/Character Statue Maker/CharacterStatue.cs b/Scripts/Engines/VeteranRewards/Character Statue Maker/CharacterStatue.cs index 62d01a9e6..b031750df 100644 --- a/Scripts/Engines/VeteranRewards/Character Statue Maker/CharacterStatue.cs +++ b/Scripts/Engines/VeteranRewards/Character Statue Maker/CharacterStatue.cs @@ -100,7 +100,7 @@ namespace Server.Mobiles set{ m_IsRewardItem = value; } } - public CharacterStatue( Mobile from, StatueType type ) : base() + public CharacterStatue( Mobile from, StatueType type ) { m_Type = type; m_Pose = StatuePose.Ready; diff --git a/Scripts/Engines/VeteranRewards/Character Statue Maker/CharacterStatueMaker.cs b/Scripts/Engines/VeteranRewards/Character Statue Maker/CharacterStatueMaker.cs index 579dbc856..b07c47035 100644 --- a/Scripts/Engines/VeteranRewards/Character Statue Maker/CharacterStatueMaker.cs +++ b/Scripts/Engines/VeteranRewards/Character Statue Maker/CharacterStatueMaker.cs @@ -8,7 +8,7 @@ namespace Server.Items { public class CharacterStatueMaker : Item, IRewardItem { - public override int LabelNumber{ get{ return 1076173; } } // Character Statue Maker + public override int LabelNumber => 1076173; // Character Statue Maker private bool m_IsRewardItem; private StatueType m_Type; diff --git a/Scripts/Engines/VeteranRewards/Character Statue Maker/CharacterStatuePlinth.cs b/Scripts/Engines/VeteranRewards/Character Statue Maker/CharacterStatuePlinth.cs index e93090080..40f68c5de 100644 --- a/Scripts/Engines/VeteranRewards/Character Statue Maker/CharacterStatuePlinth.cs +++ b/Scripts/Engines/VeteranRewards/Character Statue Maker/CharacterStatuePlinth.cs @@ -11,7 +11,7 @@ namespace Server.Items public class CharacterStatuePlinth : Static, IAddon { public Item Deed{ get{ return new CharacterStatueDeed( m_Statue ); } } - public override int LabelNumber{ get{ return 1076201; } } // Character Statue + public override int LabelNumber => 1076201; // Character Statue private CharacterStatue m_Statue; diff --git a/Scripts/Engines/VeteranRewards/RewardCategory.cs b/Scripts/Engines/VeteranRewards/RewardCategory.cs index aea682a33..81a110d90 100644 --- a/Scripts/Engines/VeteranRewards/RewardCategory.cs +++ b/Scripts/Engines/VeteranRewards/RewardCategory.cs @@ -12,7 +12,7 @@ namespace Server.Engines.VeteranRewards public int Name{ get{ return m_Name; } } public string NameString{ get{ return m_NameString; } } - public List Entries { get { return m_Entries; } } + public List Entries => m_Entries; public RewardCategory( int name ) { @@ -26,4 +26,4 @@ namespace Server.Engines.VeteranRewards m_Entries = new List(); } } -} \ No newline at end of file +} diff --git a/Scripts/Engines/VeteranRewards/RewardOptionGump.cs b/Scripts/Engines/VeteranRewards/RewardOptionGump.cs index 29341de3c..07ba5188d 100644 --- a/Scripts/Engines/VeteranRewards/RewardOptionGump.cs +++ b/Scripts/Engines/VeteranRewards/RewardOptionGump.cs @@ -39,7 +39,7 @@ namespace Server.Gumps AddButton( 10, 294, 0xFB1, 0xFB2, 0, GumpButtonType.Reply, 0 ); AddHtmlLocalized( 45, 296, 450, 20, 1060051, 0x7FFF, false, false ); // CANCEL - + if ( title > 0 ) AddHtmlLocalized( 14, 12, 273, 20, title, 0x7FFF, false, false ); else @@ -50,14 +50,14 @@ namespace Server.Gumps for ( int i = 0; i < m_Options.Count; i++ ) { AddButton( 19, 49 + i * 24, 0x845, 0x846, m_Options[ i ].ID, GumpButtonType.Reply, 0 ); - AddHtmlLocalized( 44, 47 + i * 24, 213, 20, m_Options[ i ].Cliloc, 0x7FFF, false, false ); + AddHtmlLocalized( 44, 47 + i * 24, 213, 20, m_Options[ i ].Cliloc, 0x7FFF, false, false ); } } public override void OnResponse( NetState sender, RelayInfo info ) { if ( m_Option != null && Contains( info.ButtonID ) ) - m_Option.OnOptionSelected( sender.Mobile, info.ButtonID ); + m_Option.OnOptionSelected( sender.Mobile, info.ButtonID ); } private bool Contains( int chosen ) @@ -92,7 +92,7 @@ namespace Server.Gumps public class RewardOptionList : List { - public RewardOptionList() : base() + public RewardOptionList() { } diff --git a/Scripts/Engines/Virtues/VirtueGump.cs b/Scripts/Engines/Virtues/VirtueGump.cs index f7f192e47..05bb293d2 100644 --- a/Scripts/Engines/Virtues/VirtueGump.cs +++ b/Scripts/Engines/Virtues/VirtueGump.cs @@ -38,9 +38,7 @@ namespace Server return; } - OnVirtueUsed callback = null; - - m_Callbacks.TryGetValue(e.GumpID, out callback); + m_Callbacks.TryGetValue(e.GumpID, out OnVirtueUsed callback); if ( callback != null ) callback( e.Beholder ); @@ -137,10 +135,10 @@ namespace Server if( value >= 30000 ) value = 20000; //Sanity - - + + int vl; - + if( value < 10000 ) vl = 0; else if( value >= 20000 && index == 5) @@ -151,7 +149,7 @@ namespace Server vl = 2; else vl = 1; - + return m_Table[(index * 3) + (int) vl]; } diff --git a/Scripts/Gumps/CategorizedAddGump.cs b/Scripts/Gumps/CategorizedAddGump.cs index 218fb5e50..e370febb8 100644 --- a/Scripts/Gumps/CategorizedAddGump.cs +++ b/Scripts/Gumps/CategorizedAddGump.cs @@ -25,7 +25,7 @@ namespace Server.Gumps public int Hue{ get{ return m_Hue; } } public CAGCategory Parent{ get{ return m_Parent; } } - public override string Caption{ get{ return ( m_Type == null ? "bad type" : m_Type.Name ); } } + public override string Caption => ( m_Type == null ? "bad type" : m_Type.Name ); public override void OnClick( Mobile from, int page ) { @@ -66,7 +66,7 @@ namespace Server.Gumps public CAGNode[] Nodes{ get{ return m_Nodes; } } public CAGCategory Parent{ get{ return m_Parent; } } - public override string Caption{ get{ return m_Title; } } + public override string Caption => m_Title; public override void OnClick( Mobile from, int page ) { diff --git a/Scripts/Gumps/ConfirmBreakCrystalGump.cs b/Scripts/Gumps/ConfirmBreakCrystalGump.cs index d5ee878e4..8b3ec02ab 100644 --- a/Scripts/Gumps/ConfirmBreakCrystalGump.cs +++ b/Scripts/Gumps/ConfirmBreakCrystalGump.cs @@ -7,24 +7,24 @@ namespace Server.Gumps { public class ConfirmBreakCrystalGump : BaseConfirmGump { - public override int LabelNumber{ get{ return 1075084; } } // This statuette will be destroyed when its trapped creature is summoned. The creature will be bonded to you but will disappear if released.

Do you wish to proceed? - + public override int LabelNumber => 1075084; // This statuette will be destroyed when its trapped creature is summoned. The creature will be bonded to you but will disappear if released.

Do you wish to proceed? + private BaseImprisonedMobile m_Item; - - public ConfirmBreakCrystalGump( BaseImprisonedMobile item ) : base() + + public ConfirmBreakCrystalGump( BaseImprisonedMobile item ) { m_Item = item; } - + public override void Confirm( Mobile from ) - { + { if ( m_Item == null || m_Item.Deleted ) return; - + BaseCreature summon = m_Item.Summon; - + if ( summon != null ) - { + { if ( !summon.SetControlMaster( from ) ) { summon.Delete(); @@ -32,24 +32,24 @@ namespace Server.Gumps else { from.SendLocalizedMessage( 1049666 ); // Your pet has bonded with you! - + summon.MoveToWorld( from.Location, from.Map ); summon.IsBonded = true; - + summon.Skills.Wrestling.Base = 100; summon.Skills.Tactics.Base = 100; summon.Skills.MagicResist.Base = 100; summon.Skills.Anatomy.Base = 100; - + Effects.PlaySound( summon.Location, summon.Map, summon.BaseSoundID ); Effects.SendLocationParticles( EffectItem.Create( summon.Location, summon.Map, EffectItem.DefaultDuration ), 0x3728, 1, 10, 0x26B6 ); - + m_Item.Release( from, summon ); m_Item.Delete(); } - } + } } } - - + + } diff --git a/Scripts/Gumps/Go/GoGump.cs b/Scripts/Gumps/Go/GoGump.cs index d8554092a..331e081a5 100644 --- a/Scripts/Gumps/Go/GoGump.cs +++ b/Scripts/Gumps/Go/GoGump.cs @@ -79,8 +79,7 @@ namespace Server.Gumps else tree = Tokuno; - ParentNode branch = null; - tree.LastBranch.TryGetValue( from, out branch ); + tree.LastBranch.TryGetValue( from, out ParentNode branch ); if ( branch == null ) branch = tree.Root; @@ -247,4 +246,4 @@ namespace Server.Gumps } } } -} \ No newline at end of file +} diff --git a/Scripts/Gumps/Guilds/New Guild System/BaseGuildListGump.cs b/Scripts/Gumps/Guilds/New Guild System/BaseGuildListGump.cs index 6dc230714..2d4da30d5 100644 --- a/Scripts/Gumps/Guilds/New Guild System/BaseGuildListGump.cs +++ b/Scripts/Gumps/Guilds/New Guild System/BaseGuildListGump.cs @@ -16,7 +16,7 @@ namespace Server.Guilds bool m_Ascending; string m_Filter; int m_StartNumber; - + private const int itemsPerPage = 8; public BaseGuildListGump( PlayerMobile pm, Guild g, List list, IComparer currentComparer, bool ascending, string filter, int startNumber, InfoField[] fields ) @@ -55,8 +55,8 @@ namespace Server.Guilds m_List.Sort( m_Comparer ); m_StartNumber = Math.Max( Math.Min( m_StartNumber, m_List.Count - 1 ), 0 ); - - + + AddBackground( 130, 75, 385, 30, 0xBB8 ); AddTextEntry( 135, 80, 375, 30, 0x481, 1, m_Filter ); AddButton( 520, 75, 0x867, 0x868, 5, GumpButtonType.Reply, 0 ); //Filter Button @@ -85,12 +85,12 @@ namespace Server.Guilds AddButton( 65, 80, 0x15E3, 0x15E7, 6, GumpButtonType.Reply, 0 ); // Back if( m_StartNumber + itemsPerPage > m_List.Count ) - AddButton( 95, 80, 0x15E1, 0x15E5, 0, GumpButtonType.Page, 0 ); + AddButton( 95, 80, 0x15E1, 0x15E5, 0, GumpButtonType.Page, 0 ); else AddButton( 95, 80, 0x15E1, 0x15E5, 7, GumpButtonType.Reply, 0 ); // Forward - + int itemNumber = 0; if( m_Ascending ) @@ -198,7 +198,7 @@ namespace Server.Guilds public TextDefinition Name{ get{ return m_Name; } } public int Width{ get{ return m_Width; } } - public IComparer Comparer { get { return m_Comparer; } } + public IComparer Comparer => m_Comparer; public InfoField( TextDefinition name, int width, IComparer comparer ) { m_Name = name; @@ -206,4 +206,4 @@ namespace Server.Guilds m_Comparer = comparer; } } -} \ No newline at end of file +} diff --git a/Scripts/Gumps/PolymorphGump.cs b/Scripts/Gumps/PolymorphGump.cs index 3d103c428..742358bcf 100644 --- a/Scripts/Gumps/PolymorphGump.cs +++ b/Scripts/Gumps/PolymorphGump.cs @@ -40,9 +40,9 @@ namespace Server.Gumps m_Y = Y; } - public int ArtID { get { return m_Art; } } - public int BodyID { get { return m_Body; } } - public int LocNumber{ get { return m_Num; } } + public int ArtID => m_Art; + public int BodyID => m_Body; + public int LocNumber => m_Num; public int X{ get{ return m_X; } } public int Y{ get{ return m_Y; } } } @@ -61,8 +61,8 @@ namespace Server.Gumps m_Entries = entries; } - public PolymorphEntry[] Entries{ get { return m_Entries; } } - public int LocNumber{ get { return m_Num; } } + public PolymorphEntry[] Entries => m_Entries; + public int LocNumber => m_Num; } private static PolymorphCategory[] Categories = new PolymorphCategory[] @@ -244,4 +244,4 @@ namespace Server.Gumps spell.Cast(); } } -} \ No newline at end of file +} diff --git a/Scripts/Gumps/Props/SetBodyGump.cs b/Scripts/Gumps/Props/SetBodyGump.cs index 661211716..bca39b6a3 100644 --- a/Scripts/Gumps/Props/SetBodyGump.cs +++ b/Scripts/Gumps/Props/SetBodyGump.cs @@ -235,10 +235,10 @@ namespace Server.Gumps private string m_Name; private string m_DisplayName; - public int Body { get { return m_Body; } } - public int ItemID { get { return m_ItemID; } } - public string Name { get { return m_Name; } } - public string DisplayName { get { return m_DisplayName; } } + public int Body => m_Body; + public int ItemID => m_ItemID; + public string Name => m_Name; + public string DisplayName => m_DisplayName; private static string[] m_GroupNames = new string[] { @@ -292,4 +292,4 @@ namespace Server.Gumps } } } -} \ No newline at end of file +} diff --git a/Scripts/Gumps/RewardGump.cs b/Scripts/Gumps/RewardGump.cs index 444d7f60e..71e30804a 100644 --- a/Scripts/Gumps/RewardGump.cs +++ b/Scripts/Gumps/RewardGump.cs @@ -26,10 +26,10 @@ namespace Server.Gumps private int m_Points; private RewardPickedHandler m_OnPicked; - public TextDefinition Title { get { return m_Title; } } - public IRewardEntry[] Rewards { get { return m_Rewards; } } - public int Points { get { return m_Points; } } - public RewardPickedHandler OnPicked { get { return m_OnPicked; } } + public TextDefinition Title => m_Title; + public IRewardEntry[] Rewards => m_Rewards; + public int Points => m_Points; + public RewardPickedHandler OnPicked => m_OnPicked; public RewardGump( TextDefinition title, IRewardEntry[] rewards, int points, RewardPickedHandler onPicked ) : base( 250, 50 ) @@ -186,4 +186,4 @@ namespace Server.Gumps sender.Mobile.SendGump( new RewardGump( m_Parent.Title, m_Parent.Rewards, m_Parent.Points, m_Parent.OnPicked ) ); } } -} \ No newline at end of file +} diff --git a/Scripts/Holiday Stuff/Christmas/2010/Addons/FireFliesDeed.cs b/Scripts/Holiday Stuff/Christmas/2010/Addons/FireFliesDeed.cs index 485038760..67ebcf83f 100644 --- a/Scripts/Holiday Stuff/Christmas/2010/Addons/FireFliesDeed.cs +++ b/Scripts/Holiday Stuff/Christmas/2010/Addons/FireFliesDeed.cs @@ -10,7 +10,7 @@ namespace Server.Items { public class Fireflies : Item, IAddon { - public override int LabelNumber { get { return 1150061; }} + public override int LabelNumber { get { return 1150061; }} public Item Deed { @@ -98,7 +98,7 @@ namespace Server.Items public class FirefliesDeed : Item { - public override int LabelNumber { get { return 1150061; } } + public override int LabelNumber => 1150061; [Constructible] public FirefliesDeed() @@ -278,4 +278,4 @@ namespace Server.Items } } } -} \ No newline at end of file +} diff --git a/Scripts/Holiday Stuff/Easter/2011/Items/DragonEasterEgg.cs b/Scripts/Holiday Stuff/Easter/2011/Items/DragonEasterEgg.cs index 51d711e2d..277868a22 100644 --- a/Scripts/Holiday Stuff/Easter/2011/Items/DragonEasterEgg.cs +++ b/Scripts/Holiday Stuff/Easter/2011/Items/DragonEasterEgg.cs @@ -4,7 +4,7 @@ namespace Server.Items { public class DragonEasterEgg : Item, IDyable { - public override int LabelNumber { get { return 1097278; } } + public override int LabelNumber => 1097278; [Constructible] public DragonEasterEgg() @@ -41,4 +41,4 @@ namespace Server.Items return true; } } -} \ No newline at end of file +} diff --git a/Scripts/Holiday Stuff/Halloween/2006/Items/HalloweenPumpkin.cs b/Scripts/Holiday Stuff/Halloween/2006/Items/HalloweenPumpkin.cs index 4ff96d31c..82e48a6e5 100644 --- a/Scripts/Holiday Stuff/Halloween/2006/Items/HalloweenPumpkin.cs +++ b/Scripts/Holiday Stuff/Halloween/2006/Items/HalloweenPumpkin.cs @@ -13,7 +13,6 @@ namespace Server.Items [Constructible] public HalloweenPumpkin() - : base() { Weight = Utility.RandomMinMax( 3, 20 ); ItemID = ( Utility.RandomDouble() <= .02 ) ? Utility.RandomList( 0x4694, 0x4698 ) : Utility.RandomList( 0xc6a, 0xc6b, 0xc6c ); diff --git a/Scripts/Holiday Stuff/Halloween/2006/Items/PumpkinScarecrow.cs b/Scripts/Holiday Stuff/Halloween/2006/Items/PumpkinScarecrow.cs index f9b0bd270..757ef3e93 100644 --- a/Scripts/Holiday Stuff/Halloween/2006/Items/PumpkinScarecrow.cs +++ b/Scripts/Holiday Stuff/Halloween/2006/Items/PumpkinScarecrow.cs @@ -6,7 +6,7 @@ namespace Server.Items { public class PumpkinScarecrow : Item { - public override int LabelNumber { get { return 1096947; } } + public override int LabelNumber => 1096947; [Constructible] public PumpkinScarecrow() diff --git a/Scripts/Holiday Stuff/Halloween/2006/Items/RuinedTapestry.cs b/Scripts/Holiday Stuff/Halloween/2006/Items/RuinedTapestry.cs index 217d1bc60..d38d2ebc8 100644 --- a/Scripts/Holiday Stuff/Halloween/2006/Items/RuinedTapestry.cs +++ b/Scripts/Holiday Stuff/Halloween/2006/Items/RuinedTapestry.cs @@ -6,7 +6,7 @@ namespace Server.Items { public class RuinedTapestry : Item { - public override string DefaultName{ get { return "Ruined Tapestry "; } } + public override string DefaultName => "Ruined Tapestry "; [Constructible] public RuinedTapestry() diff --git a/Scripts/Holiday Stuff/Halloween/2006/Items/TwilightLantern.cs b/Scripts/Holiday Stuff/Halloween/2006/Items/TwilightLantern.cs index 1e65b34c5..23ec6e951 100644 --- a/Scripts/Holiday Stuff/Halloween/2006/Items/TwilightLantern.cs +++ b/Scripts/Holiday Stuff/Halloween/2006/Items/TwilightLantern.cs @@ -6,11 +6,10 @@ namespace Server.Items public class TwilightLantern : Lantern { - public override string DefaultName { get { return "Twilight Lantern"; } } + public override string DefaultName => "Twilight Lantern"; [Constructible] public TwilightLantern() - : base() { Hue = Utility.RandomBool() ? 244 : 997; } diff --git a/Scripts/Holiday Stuff/Halloween/2009/Foods/CreepyCake.cs b/Scripts/Holiday Stuff/Halloween/2009/Foods/CreepyCake.cs index 0d5c06732..1248e0c4b 100644 --- a/Scripts/Holiday Stuff/Halloween/2009/Foods/CreepyCake.cs +++ b/Scripts/Holiday Stuff/Halloween/2009/Foods/CreepyCake.cs @@ -3,14 +3,14 @@ using Server; namespace Server.Items { - /* - first seen halloween 2009. subsequently in 2010, + /* + first seen halloween 2009. subsequently in 2010, 2011 and 2012. GM Beggar-only Semi-Rare Treats */ public class CreepyCake : Food { - public override string DefaultName { get { return "Creepy Cake"; } } + public override string DefaultName => "Creepy Cake"; [Constructible] public CreepyCake() diff --git a/Scripts/Holiday Stuff/Halloween/2009/Foods/HarvestWine.cs b/Scripts/Holiday Stuff/Halloween/2009/Foods/HarvestWine.cs index a59f1abe7..fb9ea2127 100644 --- a/Scripts/Holiday Stuff/Halloween/2009/Foods/HarvestWine.cs +++ b/Scripts/Holiday Stuff/Halloween/2009/Foods/HarvestWine.cs @@ -3,15 +3,15 @@ using Server; namespace Server.Items { - /* - first seen halloween 2009. subsequently in 2010, + /* + first seen halloween 2009. subsequently in 2010, 2011 and 2012. GM Beggar-only Semi-Rare Treats */ public class HarvestWine : BeverageBottle { - public override string DefaultName { get { return "Harvest Wine"; } } - public override double DefaultWeight { get { return 1; } } + public override string DefaultName => "Harvest Wine"; + public override double DefaultWeight => 1; [Constructible] public HarvestWine() diff --git a/Scripts/Holiday Stuff/Halloween/2009/Foods/MrPlainsCookies.cs b/Scripts/Holiday Stuff/Halloween/2009/Foods/MrPlainsCookies.cs index 68ac2d216..21d48d900 100644 --- a/Scripts/Holiday Stuff/Halloween/2009/Foods/MrPlainsCookies.cs +++ b/Scripts/Holiday Stuff/Halloween/2009/Foods/MrPlainsCookies.cs @@ -5,7 +5,7 @@ namespace Server.Items { public class MrPlainsCookies : Food { - public override string DefaultName{ get { return "Mr Plain's Cookies"; } } + public override string DefaultName => "Mr Plain's Cookies"; [Constructible] public MrPlainsCookies( ) diff --git a/Scripts/Holiday Stuff/Halloween/2009/Foods/MurkyMilk.cs b/Scripts/Holiday Stuff/Halloween/2009/Foods/MurkyMilk.cs index 62efeaf2a..78c0b0941 100644 --- a/Scripts/Holiday Stuff/Halloween/2009/Foods/MurkyMilk.cs +++ b/Scripts/Holiday Stuff/Halloween/2009/Foods/MurkyMilk.cs @@ -4,16 +4,16 @@ using Server.Mobiles; namespace Server.Items { - /* - first seen halloween 2009. subsequently in 2010, + /* + first seen halloween 2009. subsequently in 2010, 2011 and 2012. GM Beggar-only Semi-Rare Treats */ public class MurkyMilk : Pitcher { - public override string DefaultName { get { return "Murky Milk";; } } - public override int MaxQuantity { get { return 5; } } - public override double DefaultWeight { get { return 1; } } + public override string DefaultName => "Murky Milk"; + public override int MaxQuantity => 5; + public override double DefaultWeight => 1; [Constructible] public MurkyMilk( ) diff --git a/Scripts/Holiday Stuff/Halloween/2009/Foods/PumpkinPizza.cs b/Scripts/Holiday Stuff/Halloween/2009/Foods/PumpkinPizza.cs index 44f7a6556..2a34d2db7 100644 --- a/Scripts/Holiday Stuff/Halloween/2009/Foods/PumpkinPizza.cs +++ b/Scripts/Holiday Stuff/Halloween/2009/Foods/PumpkinPizza.cs @@ -3,18 +3,17 @@ using Server; namespace Server.Items { - /* - first seen halloween 2009. subsequently in 2010, + /* + first seen halloween 2009. subsequently in 2010, 2011 and 2012. GM Beggar-only Semi-Rare Treats */ public class PumpkinPizza : CheesePizza { - public override string DefaultName { get { return "Pumpkin Pizza"; } } + public override string DefaultName => "Pumpkin Pizza"; [Constructible] public PumpkinPizza( ) - : base() { Hue = 0xF3; } diff --git a/Scripts/Holiday Stuff/Halloween/2009/Items/GrimWarning.cs b/Scripts/Holiday Stuff/Halloween/2009/Items/GrimWarning.cs index a90017ea0..4177a4e23 100644 --- a/Scripts/Holiday Stuff/Halloween/2009/Items/GrimWarning.cs +++ b/Scripts/Holiday Stuff/Halloween/2009/Items/GrimWarning.cs @@ -3,14 +3,14 @@ using Server; namespace Server.Items { - /* - first seen halloween 2009. subsequently in 2010, + /* + first seen halloween 2009. subsequently in 2010, 2011 and 2012. GM Beggar-only Semi-Rare Treats */ public class GrimWarning : Item { - public override double DefaultWeight { get { return 1; } } + public override double DefaultWeight => 1; [Constructible] public GrimWarning () diff --git a/Scripts/Holiday Stuff/Halloween/2009/Items/SkullsOnPike.cs b/Scripts/Holiday Stuff/Halloween/2009/Items/SkullsOnPike.cs index 9d1c2f3d8..086434e28 100644 --- a/Scripts/Holiday Stuff/Halloween/2009/Items/SkullsOnPike.cs +++ b/Scripts/Holiday Stuff/Halloween/2009/Items/SkullsOnPike.cs @@ -3,14 +3,14 @@ using Server; namespace Server.Items { - /* - first seen halloween 2009. subsequently in 2010, + /* + first seen halloween 2009. subsequently in 2010, 2011 and 2012. GM Beggar-only Semi-Rare Treats */ public class SkullsOnPike : Item { - public override double DefaultWeight { get { return 1; } } + public override double DefaultWeight => 1; [Constructible] public SkullsOnPike() diff --git a/Scripts/Holiday Stuff/Halloween/2010/Items/ChairInAGhostCostume.cs b/Scripts/Holiday Stuff/Halloween/2010/Items/ChairInAGhostCostume.cs index 90a5e3d08..3ea183386 100644 --- a/Scripts/Holiday Stuff/Halloween/2010/Items/ChairInAGhostCostume.cs +++ b/Scripts/Holiday Stuff/Halloween/2010/Items/ChairInAGhostCostume.cs @@ -5,7 +5,7 @@ namespace Server.Items { public class ChairInAGhostCostume : Item { - public override double DefaultWeight { get { return 5; } } + public override double DefaultWeight => 5; [Constructible] public ChairInAGhostCostume() diff --git a/Scripts/Holiday Stuff/Halloween/2010/Items/ColoredSmallWebs.cs b/Scripts/Holiday Stuff/Halloween/2010/Items/ColoredSmallWebs.cs index c10990caf..37799ed41 100644 --- a/Scripts/Holiday Stuff/Halloween/2010/Items/ColoredSmallWebs.cs +++ b/Scripts/Holiday Stuff/Halloween/2010/Items/ColoredSmallWebs.cs @@ -5,13 +5,13 @@ namespace Server.Items { public class ColoredSmallWebs : Item { - public override double DefaultWeight { get { return 5; } } + public override double DefaultWeight => 5; [Constructible] public ColoredSmallWebs() : base( Utility.RandomBool() ? 0x10d6 : 0x10d7 ) { - Hue = Utility.RandomBool() ? 0x455 : 0x4E9; + Hue = Utility.RandomBool() ? 0x455 : 0x4E9; } public ColoredSmallWebs( Serial serial ) diff --git a/Scripts/Holiday Stuff/Halloween/2010/Items/ExcellentIronMaiden.cs b/Scripts/Holiday Stuff/Halloween/2010/Items/ExcellentIronMaiden.cs index bb11d30f6..958950ee4 100644 --- a/Scripts/Holiday Stuff/Halloween/2010/Items/ExcellentIronMaiden.cs +++ b/Scripts/Holiday Stuff/Halloween/2010/Items/ExcellentIronMaiden.cs @@ -5,7 +5,7 @@ namespace Server.Items { public class ExcellentIronMaiden : Item { - public override double DefaultWeight { get { return 5; } } + public override double DefaultWeight => 5; [Constructible] public ExcellentIronMaiden() diff --git a/Scripts/Holiday Stuff/Halloween/2010/Items/HalloweenGuillotine.cs b/Scripts/Holiday Stuff/Halloween/2010/Items/HalloweenGuillotine.cs index 74fa00423..cf0dae8d4 100644 --- a/Scripts/Holiday Stuff/Halloween/2010/Items/HalloweenGuillotine.cs +++ b/Scripts/Holiday Stuff/Halloween/2010/Items/HalloweenGuillotine.cs @@ -5,7 +5,7 @@ namespace Server.Items { public class HalloweenGuillotine : Item { - public override double DefaultWeight { get { return 5; } } + public override double DefaultWeight => 5; [Constructible] public HalloweenGuillotine() : base( 0x3F27 ) diff --git a/Scripts/Holiday Stuff/Halloween/2011/Items/ClownMask.cs b/Scripts/Holiday Stuff/Halloween/2011/Items/ClownMask.cs index be328795a..303e75c3d 100644 --- a/Scripts/Holiday Stuff/Halloween/2011/Items/ClownMask.cs +++ b/Scripts/Holiday Stuff/Halloween/2011/Items/ClownMask.cs @@ -5,7 +5,7 @@ namespace Server.Items.Holiday { public class PaintedEvilClownMask : BasePaintedMask { - public override string MaskName { get { return "Evil Clown Mask"; } } + public override string MaskName => "Evil Clown Mask"; [Constructible] public PaintedEvilClownMask( ) diff --git a/Scripts/Holiday Stuff/Halloween/2011/Items/DaemonMask.cs b/Scripts/Holiday Stuff/Halloween/2011/Items/DaemonMask.cs index 7ab07ffb1..37edb852f 100644 --- a/Scripts/Holiday Stuff/Halloween/2011/Items/DaemonMask.cs +++ b/Scripts/Holiday Stuff/Halloween/2011/Items/DaemonMask.cs @@ -5,7 +5,7 @@ namespace Server.Items.Holiday { public class PaintedDaemonMask : BasePaintedMask { - public override string MaskName { get { return "Daemon Mask"; } } + public override string MaskName => "Daemon Mask"; [Constructible] public PaintedDaemonMask() diff --git a/Scripts/Holiday Stuff/Halloween/2011/Items/PlagueMask.cs b/Scripts/Holiday Stuff/Halloween/2011/Items/PlagueMask.cs index 8aebd817e..6ca66371e 100644 --- a/Scripts/Holiday Stuff/Halloween/2011/Items/PlagueMask.cs +++ b/Scripts/Holiday Stuff/Halloween/2011/Items/PlagueMask.cs @@ -5,7 +5,7 @@ namespace Server.Items.Holiday { public class PaintedPlagueMask : BasePaintedMask { - public override string MaskName { get { return "Plague Mask"; } } + public override string MaskName => "Plague Mask"; [Constructible] public PaintedPlagueMask() diff --git a/Scripts/Holiday Stuff/Halloween/2012/Engines/PlayerZombies.cs b/Scripts/Holiday Stuff/Halloween/2012/Engines/PlayerZombies.cs index 0d053cf43..383072e94 100644 --- a/Scripts/Holiday Stuff/Halloween/2012/Engines/PlayerZombies.cs +++ b/Scripts/Holiday Stuff/Halloween/2012/Engines/PlayerZombies.cs @@ -250,7 +250,7 @@ namespace Server.Engines.Events public override bool BleedImmune => true; - public override Poison PoisonImmune { get { return Poison.Regular; } } + public override Poison PoisonImmune => Poison.Regular; public ZombieSkeleton( Serial serial ) : base( serial ) diff --git a/Scripts/Holiday Stuff/Halloween/2012/Items/EvilJesterMask.cs b/Scripts/Holiday Stuff/Halloween/2012/Items/EvilJesterMask.cs index 2fa7dbf62..e8955faa3 100644 --- a/Scripts/Holiday Stuff/Halloween/2012/Items/EvilJesterMask.cs +++ b/Scripts/Holiday Stuff/Halloween/2012/Items/EvilJesterMask.cs @@ -5,7 +5,7 @@ namespace Server.Items.Holiday { public class PaintedEvilJesterMask : BasePaintedMask { - public override string MaskName { get { return "Evil Jester Mask"; } } + public override string MaskName => "Evil Jester Mask"; [Constructible] public PaintedEvilJesterMask() diff --git a/Scripts/Holiday Stuff/Halloween/2012/Items/PorcelainMask.cs b/Scripts/Holiday Stuff/Halloween/2012/Items/PorcelainMask.cs index 7c261b1f6..02df97160 100644 --- a/Scripts/Holiday Stuff/Halloween/2012/Items/PorcelainMask.cs +++ b/Scripts/Holiday Stuff/Halloween/2012/Items/PorcelainMask.cs @@ -5,7 +5,7 @@ namespace Server.Items.Holiday { public class PaintedPorcelainMask : BasePaintedMask { - public override string MaskName { get { return "Porcelain Mask"; } } + public override string MaskName => "Porcelain Mask"; [Constructible] public PaintedPorcelainMask() diff --git a/Scripts/Holiday Stuff/Halloween/Treats/Jellybeans.cs b/Scripts/Holiday Stuff/Halloween/Treats/Jellybeans.cs index a553d3ae5..e2d2456a9 100644 --- a/Scripts/Holiday Stuff/Halloween/Treats/Jellybeans.cs +++ b/Scripts/Holiday Stuff/Halloween/Treats/Jellybeans.cs @@ -5,10 +5,10 @@ namespace Server.Items { public class JellyBeans : CandyCane { - public override int LabelNumber { get { return 1096932; } } /* jellybeans */ + public override int LabelNumber => 1096932; /* jellybeans */ [Constructible] - public JellyBeans() + public JellyBeans() : this( 1 ) { } diff --git a/Scripts/Holiday Stuff/Halloween/Treats/NougatSwirl.cs b/Scripts/Holiday Stuff/Halloween/Treats/NougatSwirl.cs index fada6c633..26c4bb557 100644 --- a/Scripts/Holiday Stuff/Halloween/Treats/NougatSwirl.cs +++ b/Scripts/Holiday Stuff/Halloween/Treats/NougatSwirl.cs @@ -5,7 +5,7 @@ namespace Server.Items { public class NougatSwirl : CandyCane { - public override int LabelNumber { get { return 1096936; } } /* nougat swirl */ + public override int LabelNumber => 1096936; /* nougat swirl */ [Constructible] public NougatSwirl() : this(1) diff --git a/Scripts/Holiday Stuff/Halloween/Treats/Taffy.cs b/Scripts/Holiday Stuff/Halloween/Treats/Taffy.cs index 694c3d8c4..69cd46319 100644 --- a/Scripts/Holiday Stuff/Halloween/Treats/Taffy.cs +++ b/Scripts/Holiday Stuff/Halloween/Treats/Taffy.cs @@ -5,7 +5,7 @@ namespace Server.Items { public class Taffy : CandyCane { - public override int LabelNumber { get { return 1096949; } } /* taffy */ + public override int LabelNumber => 1096949; /* taffy */ [Constructible] public Taffy() diff --git a/Scripts/Holiday Stuff/Halloween/Treats/WrappedCandy.cs b/Scripts/Holiday Stuff/Halloween/Treats/WrappedCandy.cs index ea3d14096..e750c0a82 100644 --- a/Scripts/Holiday Stuff/Halloween/Treats/WrappedCandy.cs +++ b/Scripts/Holiday Stuff/Halloween/Treats/WrappedCandy.cs @@ -5,7 +5,7 @@ namespace Server.Items { public class WrappedCandy : CandyCane { - public override int LabelNumber { get { return 1096950; } } /* wrapped candy */ + public override int LabelNumber => 1096950; /* wrapped candy */ [Constructible] public WrappedCandy() diff --git a/Scripts/Holiday Stuff/Valentine/2012/Items/CupidStatue.cs b/Scripts/Holiday Stuff/Valentine/2012/Items/CupidStatue.cs index 66128bd43..d11da3afc 100644 --- a/Scripts/Holiday Stuff/Valentine/2012/Items/CupidStatue.cs +++ b/Scripts/Holiday Stuff/Valentine/2012/Items/CupidStatue.cs @@ -6,7 +6,7 @@ namespace Server.Items [FlippableAttribute( 0x4F7C, 0x4F7D )] public class CupidStatue : Item { - public override int LabelNumber { get { return 1099220; } } // cupid statue + public override int LabelNumber => 1099220; // cupid statue [Constructible] public CupidStatue() diff --git a/Scripts/Holiday Stuff/Valentine/2012/Items/CupidsArrow.cs b/Scripts/Holiday Stuff/Valentine/2012/Items/CupidsArrow.cs index 2bd341261..c4a7a2ff3 100644 --- a/Scripts/Holiday Stuff/Valentine/2012/Items/CupidsArrow.cs +++ b/Scripts/Holiday Stuff/Valentine/2012/Items/CupidsArrow.cs @@ -8,7 +8,7 @@ namespace Server.Items { // TODO: Check messages - public override int LabelNumber { get { return 1152270; } } // Cupid's Arrow 2012 + public override int LabelNumber => 1152270; // Cupid's Arrow 2012 private string m_From; private string m_To; diff --git a/Scripts/Holiday Stuff/Valentine/2012/Items/HeartShapedBox.cs b/Scripts/Holiday Stuff/Valentine/2012/Items/HeartShapedBox.cs index 19493fc43..644af1e94 100644 --- a/Scripts/Holiday Stuff/Valentine/2012/Items/HeartShapedBox.cs +++ b/Scripts/Holiday Stuff/Valentine/2012/Items/HeartShapedBox.cs @@ -6,7 +6,7 @@ namespace Server.Items [FlippableAttribute( 0x49CA, 0x49CB )] public class HeartShapedBox : BaseContainer { - public override int DefaultDropSound { get { return m_DropSound; } } + public override int DefaultDropSound => m_DropSound; [Constructible] public HeartShapedBox() diff --git a/Scripts/Items/Addons/AbbatoirAddon.cs b/Scripts/Items/Addons/AbbatoirAddon.cs index 5222aa602..116845567 100644 --- a/Scripts/Items/Addons/AbbatoirAddon.cs +++ b/Scripts/Items/Addons/AbbatoirAddon.cs @@ -5,7 +5,7 @@ namespace Server.Items { public class AbbatoirAddon : BaseAddon { - public override BaseAddonDeed Deed{ get{ return new AbbatoirDeed(); } } + public override BaseAddonDeed Deed => new AbbatoirDeed(); [Constructible] public AbbatoirAddon() @@ -42,8 +42,8 @@ namespace Server.Items public class AbbatoirDeed : BaseAddonDeed { - public override BaseAddon Addon{ get{ return new AbbatoirAddon(); } } - public override int LabelNumber{ get{ return 1044329; } } // abbatoir + public override BaseAddon Addon => new AbbatoirAddon(); + public override int LabelNumber => 1044329; // abbatoir [Constructible] public AbbatoirDeed() @@ -68,4 +68,4 @@ namespace Server.Items int version = reader.ReadInt(); } } -} \ No newline at end of file +} diff --git a/Scripts/Items/Addons/AddonComponent.cs b/Scripts/Items/Addons/AddonComponent.cs index 213db3670..d14f665e2 100644 --- a/Scripts/Items/Addons/AddonComponent.cs +++ b/Scripts/Items/Addons/AddonComponent.cs @@ -68,7 +68,7 @@ namespace Server.Items set{ m_LabelNumber = value; InvalidateProperties(); } } - public override int LabelNumber{ get{ return m_LabelNumber; } } + public override int LabelNumber => m_LabelNumber; [Constructible] public LocalizedAddonComponent( int itemID, int labelNumber ) : base( itemID ) @@ -282,4 +282,4 @@ namespace Server.Items } } } -} \ No newline at end of file +} diff --git a/Scripts/Items/Addons/AddonContainerComponent.cs b/Scripts/Items/Addons/AddonContainerComponent.cs index b131f3b48..78378912d 100644 --- a/Scripts/Items/Addons/AddonContainerComponent.cs +++ b/Scripts/Items/Addons/AddonContainerComponent.cs @@ -7,8 +7,8 @@ namespace Server.Items { public class AddonContainerComponent : Item, IChopable { - public virtual bool NeedsWall { get { return false; } } - public virtual Point3D WallPosition { get { return Point3D.Zero; } } + public virtual bool NeedsWall => false; + public virtual Point3D WallPosition => Point3D.Zero; private Point3D m_Offset; private BaseAddonContainer m_Addon; diff --git a/Scripts/Items/Addons/AlchemistTableEastAddon.cs b/Scripts/Items/Addons/AlchemistTableEastAddon.cs index 690799831..e37b3e41c 100644 --- a/Scripts/Items/Addons/AlchemistTableEastAddon.cs +++ b/Scripts/Items/Addons/AlchemistTableEastAddon.cs @@ -5,7 +5,7 @@ namespace Server.Items { public class AlchemistTableEastAddon : BaseAddon { - public override BaseAddonDeed Deed{ get{ return new AlchemistTableEastDeed(); } } + public override BaseAddonDeed Deed => new AlchemistTableEastDeed(); [Constructible] public AlchemistTableEastAddon() @@ -34,8 +34,8 @@ namespace Server.Items public class AlchemistTableEastDeed : BaseAddonDeed { - public override BaseAddon Addon{ get{ return new AlchemistTableEastAddon(); } } - public override int LabelNumber{ get{ return 1073397; } } // alchemist table (east) + public override BaseAddon Addon => new AlchemistTableEastAddon(); + public override int LabelNumber => 1073397; // alchemist table (east) [Constructible] public AlchemistTableEastDeed() @@ -60,4 +60,4 @@ namespace Server.Items int version = reader.ReadEncodedInt(); } } -} \ No newline at end of file +} diff --git a/Scripts/Items/Addons/AlchemistTableSouthAddon.cs b/Scripts/Items/Addons/AlchemistTableSouthAddon.cs index fef964386..6fe2ca4a4 100644 --- a/Scripts/Items/Addons/AlchemistTableSouthAddon.cs +++ b/Scripts/Items/Addons/AlchemistTableSouthAddon.cs @@ -5,7 +5,7 @@ namespace Server.Items { public class AlchemistTableSouthAddon : BaseAddon { - public override BaseAddonDeed Deed{ get{ return new AlchemistTableSouthDeed(); } } + public override BaseAddonDeed Deed => new AlchemistTableSouthDeed(); [Constructible] public AlchemistTableSouthAddon() @@ -34,8 +34,8 @@ namespace Server.Items public class AlchemistTableSouthDeed : BaseAddonDeed { - public override BaseAddon Addon{ get{ return new AlchemistTableSouthAddon(); } } - public override int LabelNumber{ get{ return 1073396; } } // alchemist table (south) + public override BaseAddon Addon => new AlchemistTableSouthAddon(); + public override int LabelNumber => 1073396; // alchemist table (south) [Constructible] public AlchemistTableSouthDeed() @@ -60,4 +60,4 @@ namespace Server.Items int version = reader.ReadEncodedInt(); } } -} \ No newline at end of file +} diff --git a/Scripts/Items/Addons/AnvilEastAddon.cs b/Scripts/Items/Addons/AnvilEastAddon.cs index 74b69678e..26c4e5369 100644 --- a/Scripts/Items/Addons/AnvilEastAddon.cs +++ b/Scripts/Items/Addons/AnvilEastAddon.cs @@ -5,7 +5,7 @@ namespace Server.Items { public class AnvilEastAddon : BaseAddon { - public override BaseAddonDeed Deed{ get{ return new AnvilEastDeed(); } } + public override BaseAddonDeed Deed => new AnvilEastDeed(); [Constructible] public AnvilEastAddon() @@ -34,8 +34,8 @@ namespace Server.Items public class AnvilEastDeed : BaseAddonDeed { - public override BaseAddon Addon{ get{ return new AnvilEastAddon(); } } - public override int LabelNumber{ get{ return 1044333; } } // anvil (east) + public override BaseAddon Addon => new AnvilEastAddon(); + public override int LabelNumber => 1044333; // anvil (east) [Constructible] public AnvilEastDeed() @@ -60,4 +60,4 @@ namespace Server.Items int version = reader.ReadInt(); } } -} \ No newline at end of file +} diff --git a/Scripts/Items/Addons/AnvilSouthAddon.cs b/Scripts/Items/Addons/AnvilSouthAddon.cs index 296e95da8..b52e9e971 100644 --- a/Scripts/Items/Addons/AnvilSouthAddon.cs +++ b/Scripts/Items/Addons/AnvilSouthAddon.cs @@ -5,7 +5,7 @@ namespace Server.Items { public class AnvilSouthAddon : BaseAddon { - public override BaseAddonDeed Deed{ get{ return new AnvilSouthDeed(); } } + public override BaseAddonDeed Deed => new AnvilSouthDeed(); [Constructible] public AnvilSouthAddon() @@ -34,8 +34,8 @@ namespace Server.Items public class AnvilSouthDeed : BaseAddonDeed { - public override BaseAddon Addon{ get{ return new AnvilSouthAddon(); } } - public override int LabelNumber{ get{ return 1044334; } } // anvil (south) + public override BaseAddon Addon => new AnvilSouthAddon(); + public override int LabelNumber => 1044334; // anvil (south) [Constructible] public AnvilSouthDeed() @@ -60,4 +60,4 @@ namespace Server.Items int version = reader.ReadInt(); } } -} \ No newline at end of file +} diff --git a/Scripts/Items/Addons/ArcaneBookshelfEastAddon.cs b/Scripts/Items/Addons/ArcaneBookshelfEastAddon.cs index 3bc572842..69d9513f1 100644 --- a/Scripts/Items/Addons/ArcaneBookshelfEastAddon.cs +++ b/Scripts/Items/Addons/ArcaneBookshelfEastAddon.cs @@ -5,7 +5,7 @@ namespace Server.Items { public class ArcaneBookshelfEastAddon : BaseAddon { - public override BaseAddonDeed Deed{ get{ return new ArcaneBookshelfEastDeed(); } } + public override BaseAddonDeed Deed => new ArcaneBookshelfEastDeed(); [Constructible] public ArcaneBookshelfEastAddon() @@ -35,8 +35,8 @@ namespace Server.Items public class ArcaneBookshelfEastDeed : BaseAddonDeed { - public override BaseAddon Addon{ get{ return new ArcaneBookshelfEastAddon(); } } - public override int LabelNumber{ get{ return 1073371; } } // arcane bookshelf (east) + public override BaseAddon Addon => new ArcaneBookshelfEastAddon(); + public override int LabelNumber => 1073371; // arcane bookshelf (east) [Constructible] public ArcaneBookshelfEastDeed() @@ -61,4 +61,4 @@ namespace Server.Items int version = reader.ReadEncodedInt(); } } -} \ No newline at end of file +} diff --git a/Scripts/Items/Addons/ArcaneBookshelfSouthAddon.cs b/Scripts/Items/Addons/ArcaneBookshelfSouthAddon.cs index b53e88430..b04a823a7 100644 --- a/Scripts/Items/Addons/ArcaneBookshelfSouthAddon.cs +++ b/Scripts/Items/Addons/ArcaneBookshelfSouthAddon.cs @@ -5,7 +5,7 @@ namespace Server.Items { public class ArcaneBookshelfSouthAddon : BaseAddon { - public override BaseAddonDeed Deed{ get{ return new ArcaneBookshelfSouthDeed(); } } + public override BaseAddonDeed Deed => new ArcaneBookshelfSouthDeed(); [Constructible] public ArcaneBookshelfSouthAddon() @@ -35,8 +35,8 @@ namespace Server.Items public class ArcaneBookshelfSouthDeed : BaseAddonDeed { - public override BaseAddon Addon{ get{ return new ArcaneBookshelfSouthAddon(); } } - public override int LabelNumber{ get{ return 1072871; } } // arcane bookshelf (south) + public override BaseAddon Addon => new ArcaneBookshelfSouthAddon(); + public override int LabelNumber => 1072871; // arcane bookshelf (south) [Constructible] public ArcaneBookshelfSouthDeed() @@ -61,4 +61,4 @@ namespace Server.Items int version = reader.ReadEncodedInt(); } } -} \ No newline at end of file +} diff --git a/Scripts/Items/Addons/ArcaneCircleAddon.cs b/Scripts/Items/Addons/ArcaneCircleAddon.cs index 04641afd8..920666145 100644 --- a/Scripts/Items/Addons/ArcaneCircleAddon.cs +++ b/Scripts/Items/Addons/ArcaneCircleAddon.cs @@ -6,7 +6,7 @@ namespace Server.Items { public class ArcaneCircleAddon : BaseAddon { - public override BaseAddonDeed Deed{ get{ return new ArcaneCircleDeed(); } } + public override BaseAddonDeed Deed => new ArcaneCircleDeed(); [Constructible] public ArcaneCircleAddon() @@ -58,8 +58,8 @@ namespace Server.Items public class ArcaneCircleDeed : BaseAddonDeed { - public override BaseAddon Addon{ get{ return new ArcaneCircleAddon(); } } - public override int LabelNumber{ get{ return 1072703; } } // arcane circle + public override BaseAddon Addon => new ArcaneCircleAddon(); + public override int LabelNumber => 1072703; // arcane circle [Constructible] public ArcaneCircleDeed() @@ -84,4 +84,4 @@ namespace Server.Items int version = reader.ReadEncodedInt(); } } -} \ No newline at end of file +} diff --git a/Scripts/Items/Addons/ArcanistStatueEastAddon.cs b/Scripts/Items/Addons/ArcanistStatueEastAddon.cs index 96c4ae201..dab15d350 100644 --- a/Scripts/Items/Addons/ArcanistStatueEastAddon.cs +++ b/Scripts/Items/Addons/ArcanistStatueEastAddon.cs @@ -5,7 +5,7 @@ namespace Server.Items { public class ArcanistStatueEastAddon : BaseAddon { - public override BaseAddonDeed Deed{ get{ return new ArcanistStatueEastDeed(); } } + public override BaseAddonDeed Deed => new ArcanistStatueEastDeed(); [Constructible] public ArcanistStatueEastAddon() @@ -34,8 +34,8 @@ namespace Server.Items public class ArcanistStatueEastDeed : BaseAddonDeed { - public override BaseAddon Addon{ get{ return new ArcanistStatueEastAddon(); } } - public override int LabelNumber{ get{ return 1072886; } } // arcanist statue (east) + public override BaseAddon Addon => new ArcanistStatueEastAddon(); + public override int LabelNumber => 1072886; // arcanist statue (east) [Constructible] public ArcanistStatueEastDeed() @@ -60,4 +60,4 @@ namespace Server.Items int version = reader.ReadEncodedInt(); } } -} \ No newline at end of file +} diff --git a/Scripts/Items/Addons/ArcanistStatueSouthAddon.cs b/Scripts/Items/Addons/ArcanistStatueSouthAddon.cs index 99323e066..ef476fd25 100644 --- a/Scripts/Items/Addons/ArcanistStatueSouthAddon.cs +++ b/Scripts/Items/Addons/ArcanistStatueSouthAddon.cs @@ -5,7 +5,7 @@ namespace Server.Items { public class ArcanistStatueSouthAddon : BaseAddon { - public override BaseAddonDeed Deed{ get{ return new ArcanistStatueSouthDeed(); } } + public override BaseAddonDeed Deed => new ArcanistStatueSouthDeed(); [Constructible] public ArcanistStatueSouthAddon() @@ -34,8 +34,8 @@ namespace Server.Items public class ArcanistStatueSouthDeed : BaseAddonDeed { - public override BaseAddon Addon{ get{ return new ArcanistStatueSouthAddon(); } } - public override int LabelNumber{ get{ return 1072885; } } // arcanist statue (south) + public override BaseAddon Addon => new ArcanistStatueSouthAddon(); + public override int LabelNumber => 1072885; // arcanist statue (south) [Constructible] public ArcanistStatueSouthDeed() @@ -60,4 +60,4 @@ namespace Server.Items int version = reader.ReadEncodedInt(); } } -} \ No newline at end of file +} diff --git a/Scripts/Items/Addons/ArcheryButteAddon.cs b/Scripts/Items/Addons/ArcheryButteAddon.cs index 66e769a65..7b1af9df5 100644 --- a/Scripts/Items/Addons/ArcheryButteAddon.cs +++ b/Scripts/Items/Addons/ArcheryButteAddon.cs @@ -309,7 +309,7 @@ namespace Server.Items public class ArcheryButteAddon : BaseAddon { - public override BaseAddonDeed Deed{ get{ return new ArcheryButteDeed(); } } + public override BaseAddonDeed Deed => new ArcheryButteDeed(); [Constructible] public ArcheryButteAddon() @@ -338,8 +338,8 @@ namespace Server.Items public class ArcheryButteDeed : BaseAddonDeed { - public override BaseAddon Addon{ get{ return new ArcheryButteAddon(); } } - public override int LabelNumber{ get{ return 1024106; } } // archery butte + public override BaseAddon Addon => new ArcheryButteAddon(); + public override int LabelNumber => 1024106; // archery butte [Constructible] public ArcheryButteDeed() @@ -364,4 +364,4 @@ namespace Server.Items int version = reader.ReadInt(); } } -} \ No newline at end of file +} diff --git a/Scripts/Items/Addons/BallotBox.cs b/Scripts/Items/Addons/BallotBox.cs index 477f36db8..02c83ddec 100644 --- a/Scripts/Items/Addons/BallotBox.cs +++ b/Scripts/Items/Addons/BallotBox.cs @@ -13,7 +13,7 @@ namespace Server.Items { public static readonly int MaxTopicLines = 6; - public override int LabelNumber{ get{ return 1041006; } } // a ballot box + public override int LabelNumber => 1041006; // a ballot box private string[] m_Topic; private List m_Yes; @@ -334,7 +334,7 @@ namespace Server.Items public class BallotBoxAddon : BaseAddon { - public override BaseAddonDeed Deed{ get{ return new BallotBoxDeed(); } } + public override BaseAddonDeed Deed => new BallotBoxDeed(); public BallotBoxAddon() { @@ -362,9 +362,9 @@ namespace Server.Items public class BallotBoxDeed : BaseAddonDeed { - public override BaseAddon Addon{ get{ return new BallotBoxAddon(); } } + public override BaseAddon Addon => new BallotBoxAddon(); - public override int LabelNumber{ get{ return 1044327; } } // ballot box + public override int LabelNumber => 1044327; // ballot box [Constructible] public BallotBoxDeed() diff --git a/Scripts/Items/Addons/BaseAddonContainer.cs b/Scripts/Items/Addons/BaseAddonContainer.cs index 0c6d35e26..758fded91 100644 --- a/Scripts/Items/Addons/BaseAddonContainer.cs +++ b/Scripts/Items/Addons/BaseAddonContainer.cs @@ -58,11 +58,11 @@ namespace Server.Items get { return this.Deed; } } - public virtual bool RetainDeedHue { get { return false; } } - public virtual bool NeedsWall { get { return false; } } - public virtual bool ShareHue { get { return true; } } - public virtual Point3D WallPosition { get { return Point3D.Zero; } } - public virtual BaseAddonContainerDeed Deed { get { return null; } } + public virtual bool RetainDeedHue => false; + public virtual bool NeedsWall => false; + public virtual bool ShareHue => true; + public virtual Point3D WallPosition => Point3D.Zero; + public virtual BaseAddonContainerDeed Deed => null; private List m_Components; diff --git a/Scripts/Items/Addons/BearRugs.cs b/Scripts/Items/Addons/BearRugs.cs index ce5d31235..03245138a 100644 --- a/Scripts/Items/Addons/BearRugs.cs +++ b/Scripts/Items/Addons/BearRugs.cs @@ -5,7 +5,7 @@ namespace Server.Items { public class BrownBearRugEastAddon : BaseAddon { - public override BaseAddonDeed Deed{ get{ return new BrownBearRugEastDeed(); } } + public override BaseAddonDeed Deed => new BrownBearRugEastDeed(); [Constructible] public BrownBearRugEastAddon() @@ -42,8 +42,8 @@ namespace Server.Items public class BrownBearRugEastDeed : BaseAddonDeed { - public override BaseAddon Addon{ get{ return new BrownBearRugEastAddon(); } } - public override int LabelNumber{ get{ return 1049397; } } // a brown bear rug deed facing east + public override BaseAddon Addon => new BrownBearRugEastAddon(); + public override int LabelNumber => 1049397; // a brown bear rug deed facing east [Constructible] public BrownBearRugEastDeed() @@ -71,7 +71,7 @@ namespace Server.Items public class BrownBearRugSouthAddon : BaseAddon { - public override BaseAddonDeed Deed{ get{ return new BrownBearRugSouthDeed(); } } + public override BaseAddonDeed Deed => new BrownBearRugSouthDeed(); [Constructible] public BrownBearRugSouthAddon() @@ -108,8 +108,8 @@ namespace Server.Items public class BrownBearRugSouthDeed : BaseAddonDeed { - public override BaseAddon Addon{ get{ return new BrownBearRugSouthAddon(); } } - public override int LabelNumber{ get{ return 1049398; } } // a brown bear rug deed facing south + public override BaseAddon Addon => new BrownBearRugSouthAddon(); + public override int LabelNumber => 1049398; // a brown bear rug deed facing south [Constructible] public BrownBearRugSouthDeed() @@ -137,7 +137,7 @@ namespace Server.Items public class PolarBearRugEastAddon : BaseAddon { - public override BaseAddonDeed Deed{ get{ return new PolarBearRugEastDeed(); } } + public override BaseAddonDeed Deed => new PolarBearRugEastDeed(); [Constructible] public PolarBearRugEastAddon() @@ -174,8 +174,8 @@ namespace Server.Items public class PolarBearRugEastDeed : BaseAddonDeed { - public override BaseAddon Addon{ get{ return new PolarBearRugEastAddon(); } } - public override int LabelNumber{ get{ return 1049399; } } // a polar bear rug deed facing east + public override BaseAddon Addon => new PolarBearRugEastAddon(); + public override int LabelNumber => 1049399; // a polar bear rug deed facing east [Constructible] public PolarBearRugEastDeed() @@ -203,7 +203,7 @@ namespace Server.Items public class PolarBearRugSouthAddon : BaseAddon { - public override BaseAddonDeed Deed{ get{ return new PolarBearRugSouthDeed(); } } + public override BaseAddonDeed Deed => new PolarBearRugSouthDeed(); [Constructible] public PolarBearRugSouthAddon() @@ -240,8 +240,8 @@ namespace Server.Items public class PolarBearRugSouthDeed : BaseAddonDeed { - public override BaseAddon Addon{ get{ return new PolarBearRugSouthAddon(); } } - public override int LabelNumber{ get{ return 1049400; } } // a polar bear rug deed facing south + public override BaseAddon Addon => new PolarBearRugSouthAddon(); + public override int LabelNumber => 1049400; // a polar bear rug deed facing south [Constructible] public PolarBearRugSouthDeed() @@ -266,4 +266,4 @@ namespace Server.Items int version = reader.ReadInt(); } } -} \ No newline at end of file +} diff --git a/Scripts/Items/Addons/DartBoard.cs b/Scripts/Items/Addons/DartBoard.cs index 8f8e1808f..85e1bb35e 100644 --- a/Scripts/Items/Addons/DartBoard.cs +++ b/Scripts/Items/Addons/DartBoard.cs @@ -7,7 +7,7 @@ namespace Server.Items public class DartBoard : AddonComponent { public override bool NeedsWall => true; - public override Point3D WallPosition{ get{ return this.East ? new Point3D( -1, 0, 0 ) : new Point3D( 0, -1, 0 ); } } + public override Point3D WallPosition => this.East ? new Point3D( -1, 0, 0 ) : new Point3D( 0, -1, 0 ); public bool East{ get{ return this.ItemID == 0x1E2F; } } @@ -102,7 +102,7 @@ namespace Server.Items public class DartBoardEastAddon : BaseAddon { - public override BaseAddonDeed Deed{ get{ return new DartBoardEastDeed(); } } + public override BaseAddonDeed Deed => new DartBoardEastDeed(); public DartBoardEastAddon() { @@ -130,9 +130,9 @@ namespace Server.Items public class DartBoardEastDeed : BaseAddonDeed { - public override BaseAddon Addon{ get{ return new DartBoardEastAddon(); } } + public override BaseAddon Addon => new DartBoardEastAddon(); - public override int LabelNumber{ get{ return 1044326; } } // dartboard (east) + public override int LabelNumber => 1044326; // dartboard (east) [Constructible] public DartBoardEastDeed() @@ -160,7 +160,7 @@ namespace Server.Items public class DartBoardSouthAddon : BaseAddon { - public override BaseAddonDeed Deed{ get{ return new DartBoardSouthDeed(); } } + public override BaseAddonDeed Deed => new DartBoardSouthDeed(); public DartBoardSouthAddon() { @@ -188,9 +188,9 @@ namespace Server.Items public class DartBoardSouthDeed : BaseAddonDeed { - public override BaseAddon Addon{ get{ return new DartBoardSouthAddon(); } } + public override BaseAddon Addon => new DartBoardSouthAddon(); - public override int LabelNumber{ get{ return 1044325; } } // dartboard (south) + public override int LabelNumber => 1044325; // dartboard (south) [Constructible] public DartBoardSouthDeed() diff --git a/Scripts/Items/Addons/ElvenBedEastAddon.cs b/Scripts/Items/Addons/ElvenBedEastAddon.cs index 25f325c32..cb7517236 100644 --- a/Scripts/Items/Addons/ElvenBedEastAddon.cs +++ b/Scripts/Items/Addons/ElvenBedEastAddon.cs @@ -5,7 +5,7 @@ namespace Server.Items { public class ElvenBedEastAddon : BaseAddon { - public override BaseAddonDeed Deed{ get{ return new ElvenBedEastDeed(); } } + public override BaseAddonDeed Deed => new ElvenBedEastDeed(); [Constructible] public ElvenBedEastAddon() @@ -35,8 +35,8 @@ namespace Server.Items public class ElvenBedEastDeed : BaseAddonDeed { - public override BaseAddon Addon{ get{ return new ElvenBedEastAddon(); } } - public override int LabelNumber{ get{ return 1072861; } } // elven bed (east) + public override BaseAddon Addon => new ElvenBedEastAddon(); + public override int LabelNumber => 1072861; // elven bed (east) [Constructible] public ElvenBedEastDeed() @@ -61,4 +61,4 @@ namespace Server.Items int version = reader.ReadEncodedInt(); } } -} \ No newline at end of file +} diff --git a/Scripts/Items/Addons/ElvenBedSouthAddon.cs b/Scripts/Items/Addons/ElvenBedSouthAddon.cs index 8005213cd..5712f135e 100644 --- a/Scripts/Items/Addons/ElvenBedSouthAddon.cs +++ b/Scripts/Items/Addons/ElvenBedSouthAddon.cs @@ -5,7 +5,7 @@ namespace Server.Items { public class ElvenBedSouthAddon : BaseAddon { - public override BaseAddonDeed Deed{ get{ return new ElvenBedSouthDeed(); } } + public override BaseAddonDeed Deed => new ElvenBedSouthDeed(); [Constructible] public ElvenBedSouthAddon() @@ -35,8 +35,8 @@ namespace Server.Items public class ElvenBedSouthDeed : BaseAddonDeed { - public override BaseAddon Addon{ get{ return new ElvenBedSouthAddon(); } } - public override int LabelNumber{ get{ return 1072860; } } // elven bed (south) + public override BaseAddon Addon => new ElvenBedSouthAddon(); + public override int LabelNumber => 1072860; // elven bed (south) [Constructible] public ElvenBedSouthDeed() @@ -61,4 +61,4 @@ namespace Server.Items int version = reader.ReadEncodedInt(); } } -} \ No newline at end of file +} diff --git a/Scripts/Items/Addons/ElvenDresserEastAddon.cs b/Scripts/Items/Addons/ElvenDresserEastAddon.cs index f5af7658f..ad141741f 100644 --- a/Scripts/Items/Addons/ElvenDresserEastAddon.cs +++ b/Scripts/Items/Addons/ElvenDresserEastAddon.cs @@ -5,7 +5,7 @@ namespace Server.Items { public class ElvenDresserEastAddon : BaseAddon { - public override BaseAddonDeed Deed{ get{ return new ElvenDresserEastDeed(); } } + public override BaseAddonDeed Deed => new ElvenDresserEastDeed(); [Constructible] public ElvenDresserEastAddon() @@ -35,8 +35,8 @@ namespace Server.Items public class ElvenDresserEastDeed : BaseAddonDeed { - public override BaseAddon Addon{ get{ return new ElvenDresserEastAddon(); } } - public override int LabelNumber{ get{ return 1073388; } } // elven dresser (east) + public override BaseAddon Addon => new ElvenDresserEastAddon(); + public override int LabelNumber => 1073388; // elven dresser (east) [Constructible] public ElvenDresserEastDeed() @@ -61,4 +61,4 @@ namespace Server.Items int version = reader.ReadEncodedInt(); } } -} \ No newline at end of file +} diff --git a/Scripts/Items/Addons/ElvenDresserSouthAddon.cs b/Scripts/Items/Addons/ElvenDresserSouthAddon.cs index fbddbb686..2c9086c76 100644 --- a/Scripts/Items/Addons/ElvenDresserSouthAddon.cs +++ b/Scripts/Items/Addons/ElvenDresserSouthAddon.cs @@ -5,7 +5,7 @@ namespace Server.Items { public class ElvenDresserSouthAddon : BaseAddon { - public override BaseAddonDeed Deed{ get{ return new ElvenDresserSouthDeed(); } } + public override BaseAddonDeed Deed => new ElvenDresserSouthDeed(); [Constructible] public ElvenDresserSouthAddon() @@ -35,8 +35,8 @@ namespace Server.Items public class ElvenDresserSouthDeed : BaseAddonDeed { - public override BaseAddon Addon{ get{ return new ElvenDresserSouthAddon(); } } - public override int LabelNumber{ get{ return 1072864; } } // elven dresser (south) + public override BaseAddon Addon => new ElvenDresserSouthAddon(); + public override int LabelNumber => 1072864; // elven dresser (south) [Constructible] public ElvenDresserSouthDeed() @@ -61,4 +61,4 @@ namespace Server.Items int version = reader.ReadEncodedInt(); } } -} \ No newline at end of file +} diff --git a/Scripts/Items/Addons/ElvenForgeAddon.cs b/Scripts/Items/Addons/ElvenForgeAddon.cs index 8a6cd234b..666176688 100644 --- a/Scripts/Items/Addons/ElvenForgeAddon.cs +++ b/Scripts/Items/Addons/ElvenForgeAddon.cs @@ -5,7 +5,7 @@ namespace Server.Items { public class ElvenForgeAddon : BaseAddon { - public override BaseAddonDeed Deed{ get{ return new ElvenForgeDeed(); } } + public override BaseAddonDeed Deed => new ElvenForgeDeed(); [Constructible] public ElvenForgeAddon() @@ -34,8 +34,8 @@ namespace Server.Items public class ElvenForgeDeed : BaseAddonDeed { - public override BaseAddon Addon{ get{ return new ElvenForgeAddon(); } } - public override int LabelNumber{ get{ return 1072875; } } // squirrel statue (east) + public override BaseAddon Addon => new ElvenForgeAddon(); + public override int LabelNumber => 1072875; // squirrel statue (east) [Constructible] public ElvenForgeDeed() @@ -60,4 +60,4 @@ namespace Server.Items int version = reader.ReadEncodedInt(); } } -} \ No newline at end of file +} diff --git a/Scripts/Items/Addons/ElvenLoveseatEastAddon.cs b/Scripts/Items/Addons/ElvenLoveseatEastAddon.cs index 58fc4407d..b51757924 100644 --- a/Scripts/Items/Addons/ElvenLoveseatEastAddon.cs +++ b/Scripts/Items/Addons/ElvenLoveseatEastAddon.cs @@ -5,7 +5,7 @@ namespace Server.Items { public class ElvenLoveseatEastAddon : BaseAddon { - public override BaseAddonDeed Deed{ get{ return new ElvenLoveseatEastDeed(); } } + public override BaseAddonDeed Deed => new ElvenLoveseatEastDeed(); [Constructible] public ElvenLoveseatEastAddon() @@ -35,8 +35,8 @@ namespace Server.Items public class ElvenLoveseatEastDeed : BaseAddonDeed { - public override BaseAddon Addon{ get{ return new ElvenLoveseatEastAddon(); } } - public override int LabelNumber{ get{ return 1073372; } } // elven loveseat (east) + public override BaseAddon Addon => new ElvenLoveseatEastAddon(); + public override int LabelNumber => 1073372; // elven loveseat (east) [Constructible] public ElvenLoveseatEastDeed() @@ -61,4 +61,4 @@ namespace Server.Items int version = reader.ReadEncodedInt(); } } -} \ No newline at end of file +} diff --git a/Scripts/Items/Addons/ElvenLoveseatSouthAddon.cs b/Scripts/Items/Addons/ElvenLoveseatSouthAddon.cs index a6de0a0e3..bccbb7298 100644 --- a/Scripts/Items/Addons/ElvenLoveseatSouthAddon.cs +++ b/Scripts/Items/Addons/ElvenLoveseatSouthAddon.cs @@ -5,7 +5,7 @@ namespace Server.Items { public class ElvenLoveseatSouthAddon : BaseAddon { - public override BaseAddonDeed Deed{ get{ return new ElvenLoveseatSouthDeed(); } } + public override BaseAddonDeed Deed => new ElvenLoveseatSouthDeed(); [Constructible] public ElvenLoveseatSouthAddon() @@ -35,8 +35,8 @@ namespace Server.Items public class ElvenLoveseatSouthDeed : BaseAddonDeed { - public override BaseAddon Addon{ get{ return new ElvenLoveseatSouthAddon(); } } - public override int LabelNumber{ get{ return 1072867; } } // elven loveseat (south) + public override BaseAddon Addon => new ElvenLoveseatSouthAddon(); + public override int LabelNumber => 1072867; // elven loveseat (south) [Constructible] public ElvenLoveseatSouthDeed() @@ -61,4 +61,4 @@ namespace Server.Items int version = reader.ReadEncodedInt(); } } -} \ No newline at end of file +} diff --git a/Scripts/Items/Addons/ElvenSpinningwheelEastAddon.cs b/Scripts/Items/Addons/ElvenSpinningwheelEastAddon.cs index 3958e47c4..02d501aba 100644 --- a/Scripts/Items/Addons/ElvenSpinningwheelEastAddon.cs +++ b/Scripts/Items/Addons/ElvenSpinningwheelEastAddon.cs @@ -5,7 +5,7 @@ namespace Server.Items { public class ElvenSpinningwheelEastAddon : BaseAddon, ISpinningWheel { - public override BaseAddonDeed Deed{ get{ return new ElvenSpinningwheelEastDeed(); } } + public override BaseAddonDeed Deed => new ElvenSpinningwheelEastDeed(); [Constructible] public ElvenSpinningwheelEastAddon() @@ -108,8 +108,8 @@ namespace Server.Items public class ElvenSpinningwheelEastDeed : BaseAddonDeed { - public override BaseAddon Addon{ get{ return new ElvenSpinningwheelEastAddon(); } } - public override int LabelNumber{ get{ return 1073393; } } // elven spinning wheel (east) + public override BaseAddon Addon => new ElvenSpinningwheelEastAddon(); + public override int LabelNumber => 1073393; // elven spinning wheel (east) [Constructible] public ElvenSpinningwheelEastDeed() @@ -134,4 +134,4 @@ namespace Server.Items int version = reader.ReadEncodedInt(); } } -} \ No newline at end of file +} diff --git a/Scripts/Items/Addons/ElvenSpinningwheelSouthAddon.cs b/Scripts/Items/Addons/ElvenSpinningwheelSouthAddon.cs index ae767c1b3..13e0364a3 100644 --- a/Scripts/Items/Addons/ElvenSpinningwheelSouthAddon.cs +++ b/Scripts/Items/Addons/ElvenSpinningwheelSouthAddon.cs @@ -5,7 +5,7 @@ namespace Server.Items { public class ElvenSpinningwheelSouthAddon : BaseAddon, ISpinningWheel { - public override BaseAddonDeed Deed{ get{ return new ElvenSpinningwheelSouthDeed(); } } + public override BaseAddonDeed Deed => new ElvenSpinningwheelSouthDeed(); [Constructible] public ElvenSpinningwheelSouthAddon() @@ -110,8 +110,8 @@ namespace Server.Items public class ElvenSpinningwheelSouthDeed : BaseAddonDeed { - public override BaseAddon Addon{ get{ return new ElvenSpinningwheelSouthAddon(); } } - public override int LabelNumber{ get{ return 1072878; } } // spinning wheel (south) + public override BaseAddon Addon => new ElvenSpinningwheelSouthAddon(); + public override int LabelNumber => 1072878; // spinning wheel (south) [Constructible] public ElvenSpinningwheelSouthDeed() @@ -136,4 +136,4 @@ namespace Server.Items int version = reader.ReadEncodedInt(); } } -} \ No newline at end of file +} diff --git a/Scripts/Items/Addons/ElvenStoveEastAddon.cs b/Scripts/Items/Addons/ElvenStoveEastAddon.cs index 7a785216e..aa5d11c40 100644 --- a/Scripts/Items/Addons/ElvenStoveEastAddon.cs +++ b/Scripts/Items/Addons/ElvenStoveEastAddon.cs @@ -5,7 +5,7 @@ namespace Server.Items { public class ElvenStoveEastAddon : BaseAddon { - public override BaseAddonDeed Deed{ get{ return new ElvenStoveEastDeed(); } } + public override BaseAddonDeed Deed => new ElvenStoveEastDeed(); [Constructible] public ElvenStoveEastAddon() @@ -34,8 +34,8 @@ namespace Server.Items public class ElvenStoveEastDeed : BaseAddonDeed { - public override BaseAddon Addon{ get{ return new ElvenStoveEastAddon(); } } - public override int LabelNumber{ get{ return 1073395; } } // elven oven (east) + public override BaseAddon Addon => new ElvenStoveEastAddon(); + public override int LabelNumber => 1073395; // elven oven (east) [Constructible] public ElvenStoveEastDeed() @@ -60,4 +60,4 @@ namespace Server.Items int version = reader.ReadEncodedInt(); } } -} \ No newline at end of file +} diff --git a/Scripts/Items/Addons/ElvenStoveSouthAddon.cs b/Scripts/Items/Addons/ElvenStoveSouthAddon.cs index 5d132f63e..336738f0d 100644 --- a/Scripts/Items/Addons/ElvenStoveSouthAddon.cs +++ b/Scripts/Items/Addons/ElvenStoveSouthAddon.cs @@ -5,7 +5,7 @@ namespace Server.Items { public class ElvenStoveSouthAddon : BaseAddon { - public override BaseAddonDeed Deed{ get{ return new ElvenStoveSouthDeed(); } } + public override BaseAddonDeed Deed => new ElvenStoveSouthDeed(); [Constructible] public ElvenStoveSouthAddon() @@ -34,8 +34,8 @@ namespace Server.Items public class ElvenStoveSouthDeed : BaseAddonDeed { - public override BaseAddon Addon{ get{ return new ElvenStoveSouthAddon(); } } - public override int LabelNumber{ get{ return 1073394; } } // elven oven (south) + public override BaseAddon Addon => new ElvenStoveSouthAddon(); + public override int LabelNumber => 1073394; // elven oven (south) [Constructible] public ElvenStoveSouthDeed() @@ -60,4 +60,4 @@ namespace Server.Items int version = reader.ReadEncodedInt(); } } -} \ No newline at end of file +} diff --git a/Scripts/Items/Addons/ElvenWashbasinEastAddon.cs b/Scripts/Items/Addons/ElvenWashbasinEastAddon.cs index 7130310a8..619557e44 100644 --- a/Scripts/Items/Addons/ElvenWashbasinEastAddon.cs +++ b/Scripts/Items/Addons/ElvenWashbasinEastAddon.cs @@ -5,7 +5,7 @@ namespace Server.Items { public class ElvenWashBasinEastAddon : BaseAddon { - public override BaseAddonDeed Deed{ get{ return new ElvenWashBasinEastDeed(); } } + public override BaseAddonDeed Deed => new ElvenWashBasinEastDeed(); [Constructible] public ElvenWashBasinEastAddon() @@ -35,8 +35,8 @@ namespace Server.Items public class ElvenWashBasinEastDeed : BaseAddonDeed { - public override BaseAddon Addon{ get{ return new ElvenWashBasinEastAddon(); } } - public override int LabelNumber{ get{ return 1073387; } } // elven wash basin (east) + public override BaseAddon Addon => new ElvenWashBasinEastAddon(); + public override int LabelNumber => 1073387; // elven wash basin (east) [Constructible] public ElvenWashBasinEastDeed() @@ -61,4 +61,4 @@ namespace Server.Items int version = reader.ReadEncodedInt(); } } -} \ No newline at end of file +} diff --git a/Scripts/Items/Addons/ElvenWashbasinSouthAddon.cs b/Scripts/Items/Addons/ElvenWashbasinSouthAddon.cs index 6708d74bb..255556851 100644 --- a/Scripts/Items/Addons/ElvenWashbasinSouthAddon.cs +++ b/Scripts/Items/Addons/ElvenWashbasinSouthAddon.cs @@ -5,7 +5,7 @@ namespace Server.Items { public class ElvenWashBasinSouthAddon : BaseAddon { - public override BaseAddonDeed Deed{ get{ return new ElvenWashBasinSouthDeed(); } } + public override BaseAddonDeed Deed => new ElvenWashBasinSouthDeed(); [Constructible] public ElvenWashBasinSouthAddon() @@ -35,8 +35,8 @@ namespace Server.Items public class ElvenWashBasinSouthDeed : BaseAddonDeed { - public override BaseAddon Addon{ get{ return new ElvenWashBasinSouthAddon(); } } - public override int LabelNumber{ get{ return 1072865; } } // elven wash basin (south) + public override BaseAddon Addon => new ElvenWashBasinSouthAddon(); + public override int LabelNumber => 1072865; // elven wash basin (south) [Constructible] public ElvenWashBasinSouthDeed() @@ -61,4 +61,4 @@ namespace Server.Items int version = reader.ReadEncodedInt(); } } -} \ No newline at end of file +} diff --git a/Scripts/Items/Addons/FancyElvenTableEastAddon.cs b/Scripts/Items/Addons/FancyElvenTableEastAddon.cs index d6b1f2002..42e876abb 100644 --- a/Scripts/Items/Addons/FancyElvenTableEastAddon.cs +++ b/Scripts/Items/Addons/FancyElvenTableEastAddon.cs @@ -5,7 +5,7 @@ namespace Server.Items { public class FancyElvenTableEastAddon : BaseAddon { - public override BaseAddonDeed Deed{ get{ return new FancyElvenTableEastDeed(); } } + public override BaseAddonDeed Deed => new FancyElvenTableEastDeed(); [Constructible] public FancyElvenTableEastAddon() @@ -36,8 +36,8 @@ namespace Server.Items public class FancyElvenTableEastDeed : BaseAddonDeed { - public override BaseAddon Addon{ get{ return new FancyElvenTableEastAddon(); } } - public override int LabelNumber{ get{ return 1073386; } } // hardwood table (east) + public override BaseAddon Addon => new FancyElvenTableEastAddon(); + public override int LabelNumber => 1073386; // hardwood table (east) [Constructible] public FancyElvenTableEastDeed() @@ -62,4 +62,4 @@ namespace Server.Items int version = reader.ReadEncodedInt(); } } -} \ No newline at end of file +} diff --git a/Scripts/Items/Addons/FancyElvenTableSouthAddon.cs b/Scripts/Items/Addons/FancyElvenTableSouthAddon.cs index ddcbbe4aa..a685ce185 100644 --- a/Scripts/Items/Addons/FancyElvenTableSouthAddon.cs +++ b/Scripts/Items/Addons/FancyElvenTableSouthAddon.cs @@ -5,7 +5,7 @@ namespace Server.Items { public class FancyElvenTableSouthAddon : BaseAddon { - public override BaseAddonDeed Deed{ get{ return new FancyElvenTableSouthDeed(); } } + public override BaseAddonDeed Deed => new FancyElvenTableSouthDeed(); [Constructible] public FancyElvenTableSouthAddon() @@ -36,8 +36,8 @@ namespace Server.Items public class FancyElvenTableSouthDeed : BaseAddonDeed { - public override BaseAddon Addon{ get{ return new FancyElvenTableSouthAddon(); } } - public override int LabelNumber{ get{ return 1073385; } } // hardwood table (south) + public override BaseAddon Addon => new FancyElvenTableSouthAddon(); + public override int LabelNumber => 1073385; // hardwood table (south) [Constructible] public FancyElvenTableSouthDeed() @@ -62,4 +62,4 @@ namespace Server.Items int version = reader.ReadEncodedInt(); } } -} \ No newline at end of file +} diff --git a/Scripts/Items/Addons/FlourMillEastAddon.cs b/Scripts/Items/Addons/FlourMillEastAddon.cs index 9d21e0f47..5bb002b97 100644 --- a/Scripts/Items/Addons/FlourMillEastAddon.cs +++ b/Scripts/Items/Addons/FlourMillEastAddon.cs @@ -21,7 +21,7 @@ namespace Server.Items public class FlourMillEastAddon : BaseAddon, IFlourMill { - public override BaseAddonDeed Deed{ get{ return new FlourMillEastDeed(); } } + public override BaseAddonDeed Deed => new FlourMillEastDeed(); private int m_Flour; private Timer m_Timer; @@ -201,8 +201,8 @@ namespace Server.Items public class FlourMillEastDeed : BaseAddonDeed { - public override BaseAddon Addon{ get{ return new FlourMillEastAddon(); } } - public override int LabelNumber{ get{ return 1044347; } } // flour mill (east) + public override BaseAddon Addon => new FlourMillEastAddon(); + public override int LabelNumber => 1044347; // flour mill (east) [Constructible] public FlourMillEastDeed() @@ -227,4 +227,4 @@ namespace Server.Items int version = reader.ReadInt(); } } -} \ No newline at end of file +} diff --git a/Scripts/Items/Addons/FlourMillSouthAddon.cs b/Scripts/Items/Addons/FlourMillSouthAddon.cs index eadae9145..7f39908e4 100644 --- a/Scripts/Items/Addons/FlourMillSouthAddon.cs +++ b/Scripts/Items/Addons/FlourMillSouthAddon.cs @@ -8,7 +8,7 @@ namespace Server.Items { public class FlourMillSouthAddon : BaseAddon, IFlourMill { - public override BaseAddonDeed Deed{ get{ return new FlourMillSouthDeed(); } } + public override BaseAddonDeed Deed => new FlourMillSouthDeed(); private int m_Flour; private Timer m_Timer; @@ -187,8 +187,8 @@ namespace Server.Items public class FlourMillSouthDeed : BaseAddonDeed { - public override BaseAddon Addon{ get{ return new FlourMillSouthAddon(); } } - public override int LabelNumber{ get{ return 1044348; } } // flour mill (south) + public override BaseAddon Addon => new FlourMillSouthAddon(); + public override int LabelNumber => 1044348; // flour mill (south) [Constructible] public FlourMillSouthDeed() @@ -213,4 +213,4 @@ namespace Server.Items int version = reader.ReadInt(); } } -} \ No newline at end of file +} diff --git a/Scripts/Items/Addons/FlowerTapestries.cs b/Scripts/Items/Addons/FlowerTapestries.cs index fa5cfa9d3..675d003a1 100644 --- a/Scripts/Items/Addons/FlowerTapestries.cs +++ b/Scripts/Items/Addons/FlowerTapestries.cs @@ -5,7 +5,7 @@ namespace Server.Items { public class LightFlowerTapestryEastAddon : BaseAddon { - public override BaseAddonDeed Deed{ get{ return new LightFlowerTapestryEastDeed(); } } + public override BaseAddonDeed Deed => new LightFlowerTapestryEastDeed(); [Constructible] public LightFlowerTapestryEastAddon() @@ -35,8 +35,8 @@ namespace Server.Items public class LightFlowerTapestryEastDeed : BaseAddonDeed { - public override BaseAddon Addon{ get{ return new LightFlowerTapestryEastAddon(); } } - public override int LabelNumber{ get{ return 1049393; } } // a flower tapestry deed facing east + public override BaseAddon Addon => new LightFlowerTapestryEastAddon(); + public override int LabelNumber => 1049393; // a flower tapestry deed facing east [Constructible] public LightFlowerTapestryEastDeed() @@ -64,7 +64,7 @@ namespace Server.Items public class LightFlowerTapestrySouthAddon : BaseAddon { - public override BaseAddonDeed Deed{ get{ return new LightFlowerTapestrySouthDeed(); } } + public override BaseAddonDeed Deed => new LightFlowerTapestrySouthDeed(); [Constructible] public LightFlowerTapestrySouthAddon() @@ -94,8 +94,8 @@ namespace Server.Items public class LightFlowerTapestrySouthDeed : BaseAddonDeed { - public override BaseAddon Addon{ get{ return new LightFlowerTapestrySouthAddon(); } } - public override int LabelNumber{ get{ return 1049394; } } // a flower tapestry deed facing south + public override BaseAddon Addon => new LightFlowerTapestrySouthAddon(); + public override int LabelNumber => 1049394; // a flower tapestry deed facing south [Constructible] public LightFlowerTapestrySouthDeed() @@ -123,7 +123,7 @@ namespace Server.Items public class DarkFlowerTapestryEastAddon : BaseAddon { - public override BaseAddonDeed Deed{ get{ return new DarkFlowerTapestryEastDeed(); } } + public override BaseAddonDeed Deed => new DarkFlowerTapestryEastDeed(); [Constructible] public DarkFlowerTapestryEastAddon() @@ -153,8 +153,8 @@ namespace Server.Items public class DarkFlowerTapestryEastDeed : BaseAddonDeed { - public override BaseAddon Addon{ get{ return new DarkFlowerTapestryEastAddon(); } } - public override int LabelNumber{ get{ return 1049395; } } // a dark flower tapestry deed facing east + public override BaseAddon Addon => new DarkFlowerTapestryEastAddon(); + public override int LabelNumber => 1049395; // a dark flower tapestry deed facing east [Constructible] public DarkFlowerTapestryEastDeed() @@ -182,7 +182,7 @@ namespace Server.Items public class DarkFlowerTapestrySouthAddon : BaseAddon { - public override BaseAddonDeed Deed{ get{ return new DarkFlowerTapestrySouthDeed(); } } + public override BaseAddonDeed Deed => new DarkFlowerTapestrySouthDeed(); [Constructible] public DarkFlowerTapestrySouthAddon() @@ -212,8 +212,8 @@ namespace Server.Items public class DarkFlowerTapestrySouthDeed : BaseAddonDeed { - public override BaseAddon Addon{ get{ return new DarkFlowerTapestrySouthAddon(); } } - public override int LabelNumber{ get{ return 1049396; } } // a dark flower tapestry deed facing south + public override BaseAddon Addon => new DarkFlowerTapestrySouthAddon(); + public override int LabelNumber => 1049396; // a dark flower tapestry deed facing south [Constructible] public DarkFlowerTapestrySouthDeed() @@ -238,4 +238,4 @@ namespace Server.Items int version = reader.ReadInt(); } } -} \ No newline at end of file +} diff --git a/Scripts/Items/Addons/GozaMats.cs b/Scripts/Items/Addons/GozaMats.cs index 2208b160a..f1ead5b25 100644 --- a/Scripts/Items/Addons/GozaMats.cs +++ b/Scripts/Items/Addons/GozaMats.cs @@ -5,7 +5,7 @@ namespace Server.Items { public class GozaMatEastAddon : BaseAddon { - public override BaseAddonDeed Deed{ get{ return new GozaMatEastDeed(); } } + public override BaseAddonDeed Deed => new GozaMatEastDeed(); public override bool RetainDeedHue => true; @@ -43,8 +43,8 @@ namespace Server.Items public class GozaMatEastDeed : BaseAddonDeed { - public override BaseAddon Addon{ get{ return new GozaMatEastAddon( this.Hue ); } } - public override int LabelNumber{ get{ return 1030404; } } // goza (east) + public override BaseAddon Addon => new GozaMatEastAddon( this.Hue ); + public override int LabelNumber => 1030404; // goza (east) [Constructible] public GozaMatEastDeed() @@ -72,7 +72,7 @@ namespace Server.Items public class GozaMatSouthAddon : BaseAddon { - public override BaseAddonDeed Deed{ get{ return new GozaMatSouthDeed(); } } + public override BaseAddonDeed Deed => new GozaMatSouthDeed(); public override bool RetainDeedHue => true; @@ -110,8 +110,8 @@ namespace Server.Items public class GozaMatSouthDeed : BaseAddonDeed { - public override BaseAddon Addon{ get{ return new GozaMatSouthAddon( this.Hue ); } } - public override int LabelNumber{ get{ return 1030405; } } // goza (south) + public override BaseAddon Addon => new GozaMatSouthAddon( this.Hue ); + public override int LabelNumber => 1030405; // goza (south) [Constructible] public GozaMatSouthDeed() @@ -139,8 +139,8 @@ namespace Server.Items public class SquareGozaMatEastAddon : BaseAddon { - public override BaseAddonDeed Deed{ get{ return new SquareGozaMatEastDeed(); } } - public override int LabelNumber{ get{ return 1030688; } } // goza mat + public override BaseAddonDeed Deed => new SquareGozaMatEastDeed(); + public override int LabelNumber => 1030688; // goza mat public override bool RetainDeedHue => true; @@ -177,8 +177,8 @@ namespace Server.Items public class SquareGozaMatEastDeed : BaseAddonDeed { - public override BaseAddon Addon{ get{ return new SquareGozaMatEastAddon( this.Hue ); } } - public override int LabelNumber{ get{ return 1030407; } } // square goza (east) + public override BaseAddon Addon => new SquareGozaMatEastAddon( this.Hue ); + public override int LabelNumber => 1030407; // square goza (east) [Constructible] public SquareGozaMatEastDeed() @@ -206,7 +206,7 @@ namespace Server.Items public class SquareGozaMatSouthAddon : BaseAddon { - public override BaseAddonDeed Deed{ get{ return new SquareGozaMatSouthDeed(); } } + public override BaseAddonDeed Deed => new SquareGozaMatSouthDeed(); public override bool RetainDeedHue => true; @@ -243,8 +243,8 @@ namespace Server.Items public class SquareGozaMatSouthDeed : BaseAddonDeed { - public override BaseAddon Addon{ get{ return new SquareGozaMatSouthAddon( this.Hue ); } } - public override int LabelNumber{ get{ return 1030406; } } // square goza (south) + public override BaseAddon Addon => new SquareGozaMatSouthAddon( this.Hue ); + public override int LabelNumber => 1030406; // square goza (south) [Constructible] @@ -273,7 +273,7 @@ namespace Server.Items public class BrocadeGozaMatEastAddon : BaseAddon { - public override BaseAddonDeed Deed{ get{ return new BrocadeGozaMatEastDeed(); } } + public override BaseAddonDeed Deed => new BrocadeGozaMatEastDeed(); public override bool RetainDeedHue => true; @@ -311,8 +311,8 @@ namespace Server.Items public class BrocadeGozaMatEastDeed : BaseAddonDeed { - public override BaseAddon Addon{ get{ return new BrocadeGozaMatEastAddon( this.Hue ); } } - public override int LabelNumber{ get{ return 1030408; } } // brocade goza (east) + public override BaseAddon Addon => new BrocadeGozaMatEastAddon( this.Hue ); + public override int LabelNumber => 1030408; // brocade goza (east) [Constructible] public BrocadeGozaMatEastDeed() @@ -339,7 +339,7 @@ namespace Server.Items } public class BrocadeGozaMatSouthAddon : BaseAddon { - public override BaseAddonDeed Deed{ get{ return new BrocadeGozaMatSouthDeed(); } } + public override BaseAddonDeed Deed => new BrocadeGozaMatSouthDeed(); public override bool RetainDeedHue => true; @@ -377,8 +377,8 @@ namespace Server.Items public class BrocadeGozaMatSouthDeed : BaseAddonDeed { - public override BaseAddon Addon{ get{ return new BrocadeGozaMatSouthAddon( this.Hue ); } } - public override int LabelNumber{ get{ return 1030409; } } // brocade goza (south) + public override BaseAddon Addon => new BrocadeGozaMatSouthAddon( this.Hue ); + public override int LabelNumber => 1030409; // brocade goza (south) [Constructible] public BrocadeGozaMatSouthDeed() @@ -405,7 +405,7 @@ namespace Server.Items } public class BrocadeSquareGozaMatEastAddon : BaseAddon { - public override BaseAddonDeed Deed{ get{ return new BrocadeSquareGozaMatEastDeed(); } } + public override BaseAddonDeed Deed => new BrocadeSquareGozaMatEastDeed(); public override bool RetainDeedHue => true; @@ -442,8 +442,8 @@ namespace Server.Items public class BrocadeSquareGozaMatEastDeed : BaseAddonDeed { - public override BaseAddon Addon{ get{ return new BrocadeSquareGozaMatEastAddon( this.Hue ); } } - public override int LabelNumber{ get{ return 1030411; } } // brocade square goza (east) + public override BaseAddon Addon => new BrocadeSquareGozaMatEastAddon( this.Hue ); + public override int LabelNumber => 1030411; // brocade square goza (east) [Constructible] public BrocadeSquareGozaMatEastDeed() @@ -471,7 +471,7 @@ namespace Server.Items public class BrocadeSquareGozaMatSouthAddon : BaseAddon { - public override BaseAddonDeed Deed{ get{ return new BrocadeSquareGozaMatSouthDeed(); } } + public override BaseAddonDeed Deed => new BrocadeSquareGozaMatSouthDeed(); public override bool RetainDeedHue => true; @@ -508,8 +508,8 @@ namespace Server.Items public class BrocadeSquareGozaMatSouthDeed : BaseAddonDeed { - public override BaseAddon Addon{ get{ return new BrocadeSquareGozaMatSouthAddon( this.Hue ); } } - public override int LabelNumber{ get{ return 1030410; } } // brocade square goza (south) + public override BaseAddon Addon => new BrocadeSquareGozaMatSouthAddon( this.Hue ); + public override int LabelNumber => 1030410; // brocade square goza (south) [Constructible] diff --git a/Scripts/Items/Addons/GrayBrickFireplaceEastAddon.cs b/Scripts/Items/Addons/GrayBrickFireplaceEastAddon.cs index e68e08c47..6ad30878f 100644 --- a/Scripts/Items/Addons/GrayBrickFireplaceEastAddon.cs +++ b/Scripts/Items/Addons/GrayBrickFireplaceEastAddon.cs @@ -5,7 +5,7 @@ namespace Server.Items { public class GrayBrickFireplaceEastAddon : BaseAddon { - public override BaseAddonDeed Deed{ get{ return new GrayBrickFireplaceEastDeed(); } } + public override BaseAddonDeed Deed => new GrayBrickFireplaceEastDeed(); [Constructible] public GrayBrickFireplaceEastAddon() @@ -35,8 +35,8 @@ namespace Server.Items public class GrayBrickFireplaceEastDeed : BaseAddonDeed { - public override BaseAddon Addon{ get{ return new GrayBrickFireplaceEastAddon(); } } - public override int LabelNumber{ get{ return 1061846; } } // grey brick fireplace (east) + public override BaseAddon Addon => new GrayBrickFireplaceEastAddon(); + public override int LabelNumber => 1061846; // grey brick fireplace (east) [Constructible] public GrayBrickFireplaceEastDeed() @@ -61,4 +61,4 @@ namespace Server.Items int version = reader.ReadInt(); } } -} \ No newline at end of file +} diff --git a/Scripts/Items/Addons/GrayBrickFireplaceSouthAddon.cs b/Scripts/Items/Addons/GrayBrickFireplaceSouthAddon.cs index 44785adec..aa20c542f 100644 --- a/Scripts/Items/Addons/GrayBrickFireplaceSouthAddon.cs +++ b/Scripts/Items/Addons/GrayBrickFireplaceSouthAddon.cs @@ -5,7 +5,7 @@ namespace Server.Items { public class GrayBrickFireplaceSouthAddon : BaseAddon { - public override BaseAddonDeed Deed{ get{ return new GrayBrickFireplaceSouthDeed(); } } + public override BaseAddonDeed Deed => new GrayBrickFireplaceSouthDeed(); [Constructible] public GrayBrickFireplaceSouthAddon() @@ -35,8 +35,8 @@ namespace Server.Items public class GrayBrickFireplaceSouthDeed : BaseAddonDeed { - public override BaseAddon Addon{ get{ return new GrayBrickFireplaceSouthAddon(); } } - public override int LabelNumber{ get{ return 1061847; } } // grey brick fireplace (south) + public override BaseAddon Addon => new GrayBrickFireplaceSouthAddon(); + public override int LabelNumber => 1061847; // grey brick fireplace (south) [Constructible] public GrayBrickFireplaceSouthDeed() @@ -61,4 +61,4 @@ namespace Server.Items int version = reader.ReadInt(); } } -} \ No newline at end of file +} diff --git a/Scripts/Items/Addons/LargeBedEastAddon.cs b/Scripts/Items/Addons/LargeBedEastAddon.cs index 87f256cb7..c8ac18b9d 100644 --- a/Scripts/Items/Addons/LargeBedEastAddon.cs +++ b/Scripts/Items/Addons/LargeBedEastAddon.cs @@ -5,7 +5,7 @@ namespace Server.Items { public class LargeBedEastAddon : BaseAddon { - public override BaseAddonDeed Deed{ get{ return new LargeBedEastDeed(); } } + public override BaseAddonDeed Deed => new LargeBedEastDeed(); [Constructible] public LargeBedEastAddon() @@ -37,8 +37,8 @@ namespace Server.Items public class LargeBedEastDeed : BaseAddonDeed { - public override BaseAddon Addon{ get{ return new LargeBedEastAddon(); } } - public override int LabelNumber{ get{ return 1044324; } } // large bed (east) + public override BaseAddon Addon => new LargeBedEastAddon(); + public override int LabelNumber => 1044324; // large bed (east) [Constructible] public LargeBedEastDeed() @@ -63,4 +63,4 @@ namespace Server.Items int version = reader.ReadInt(); } } -} \ No newline at end of file +} diff --git a/Scripts/Items/Addons/LargeBedSouthAddon.cs b/Scripts/Items/Addons/LargeBedSouthAddon.cs index 8773975ba..802fba8bb 100644 --- a/Scripts/Items/Addons/LargeBedSouthAddon.cs +++ b/Scripts/Items/Addons/LargeBedSouthAddon.cs @@ -5,7 +5,7 @@ namespace Server.Items { public class LargeBedSouthAddon : BaseAddon { - public override BaseAddonDeed Deed{ get{ return new LargeBedSouthDeed(); } } + public override BaseAddonDeed Deed => new LargeBedSouthDeed(); [Constructible] public LargeBedSouthAddon() @@ -37,8 +37,8 @@ namespace Server.Items public class LargeBedSouthDeed : BaseAddonDeed { - public override BaseAddon Addon{ get{ return new LargeBedSouthAddon(); } } - public override int LabelNumber{ get{ return 1044323; } } // large bed (south) + public override BaseAddon Addon => new LargeBedSouthAddon(); + public override int LabelNumber => 1044323; // large bed (south) [Constructible] public LargeBedSouthDeed() @@ -63,4 +63,4 @@ namespace Server.Items int version = reader.ReadInt(); } } -} \ No newline at end of file +} diff --git a/Scripts/Items/Addons/LargeForgeEastAddon.cs b/Scripts/Items/Addons/LargeForgeEastAddon.cs index f327821f4..7359eaf28 100644 --- a/Scripts/Items/Addons/LargeForgeEastAddon.cs +++ b/Scripts/Items/Addons/LargeForgeEastAddon.cs @@ -5,7 +5,7 @@ namespace Server.Items { public class LargeForgeEastAddon : BaseAddon { - public override BaseAddonDeed Deed{ get{ return new LargeForgeEastDeed(); } } + public override BaseAddonDeed Deed => new LargeForgeEastDeed(); [Constructible] public LargeForgeEastAddon() @@ -37,8 +37,8 @@ namespace Server.Items public class LargeForgeEastDeed : BaseAddonDeed { - public override BaseAddon Addon{ get{ return new LargeForgeEastAddon(); } } - public override int LabelNumber{ get{ return 1044331; } } // large forge (east) + public override BaseAddon Addon => new LargeForgeEastAddon(); + public override int LabelNumber => 1044331; // large forge (east) [Constructible] public LargeForgeEastDeed() @@ -63,4 +63,4 @@ namespace Server.Items int version = reader.ReadInt(); } } -} \ No newline at end of file +} diff --git a/Scripts/Items/Addons/LargeForgeSouthAddon.cs b/Scripts/Items/Addons/LargeForgeSouthAddon.cs index 5618515ce..dc8d0517b 100644 --- a/Scripts/Items/Addons/LargeForgeSouthAddon.cs +++ b/Scripts/Items/Addons/LargeForgeSouthAddon.cs @@ -5,7 +5,7 @@ namespace Server.Items { public class LargeForgeSouthAddon : BaseAddon { - public override BaseAddonDeed Deed{ get{ return new LargeForgeSouthDeed(); } } + public override BaseAddonDeed Deed => new LargeForgeSouthDeed(); [Constructible] public LargeForgeSouthAddon() @@ -37,8 +37,8 @@ namespace Server.Items public class LargeForgeSouthDeed : BaseAddonDeed { - public override BaseAddon Addon{ get{ return new LargeForgeSouthAddon(); } } - public override int LabelNumber{ get{ return 1044332; } } // large forge (south) + public override BaseAddon Addon => new LargeForgeSouthAddon(); + public override int LabelNumber => 1044332; // large forge (south) [Constructible] public LargeForgeSouthDeed() @@ -63,4 +63,4 @@ namespace Server.Items int version = reader.ReadInt(); } } -} \ No newline at end of file +} diff --git a/Scripts/Items/Addons/LargeStoneTableEastAddon.cs b/Scripts/Items/Addons/LargeStoneTableEastAddon.cs index 2d25e77f3..60130aaed 100644 --- a/Scripts/Items/Addons/LargeStoneTableEastAddon.cs +++ b/Scripts/Items/Addons/LargeStoneTableEastAddon.cs @@ -5,7 +5,7 @@ namespace Server.Items { public class LargeStoneTableEastAddon : BaseAddon { - public override BaseAddonDeed Deed{ get{ return new LargeStoneTableEastDeed(); } } + public override BaseAddonDeed Deed => new LargeStoneTableEastDeed(); public override bool RetainDeedHue => true; @@ -44,8 +44,8 @@ namespace Server.Items public class LargeStoneTableEastDeed : BaseAddonDeed { - public override BaseAddon Addon{ get{ return new LargeStoneTableEastAddon( this.Hue ); } } - public override int LabelNumber{ get{ return 1044511; } } // large stone table (east) + public override BaseAddon Addon => new LargeStoneTableEastAddon( this.Hue ); + public override int LabelNumber => 1044511; // large stone table (east) [Constructible] public LargeStoneTableEastDeed() diff --git a/Scripts/Items/Addons/LargeStoneTableSouthAddon.cs b/Scripts/Items/Addons/LargeStoneTableSouthAddon.cs index fd28c96b7..4192bebfa 100644 --- a/Scripts/Items/Addons/LargeStoneTableSouthAddon.cs +++ b/Scripts/Items/Addons/LargeStoneTableSouthAddon.cs @@ -5,7 +5,7 @@ namespace Server.Items { public class LargeStoneTableSouthAddon : BaseAddon { - public override BaseAddonDeed Deed{ get{ return new LargeStoneTableSouthDeed(); } } + public override BaseAddonDeed Deed => new LargeStoneTableSouthDeed(); public override bool RetainDeedHue => true; @@ -44,8 +44,8 @@ namespace Server.Items public class LargeStoneTableSouthDeed : BaseAddonDeed { - public override BaseAddon Addon{ get{ return new LargeStoneTableSouthAddon( this.Hue ); } } - public override int LabelNumber{ get{ return 1044512; } } // large stone table (South) + public override BaseAddon Addon => new LargeStoneTableSouthAddon( this.Hue ); + public override int LabelNumber => 1044512; // large stone table (South) [Constructible] public LargeStoneTableSouthDeed() diff --git a/Scripts/Items/Addons/LoomEastAddon.cs b/Scripts/Items/Addons/LoomEastAddon.cs index e0e239db7..772074b0d 100644 --- a/Scripts/Items/Addons/LoomEastAddon.cs +++ b/Scripts/Items/Addons/LoomEastAddon.cs @@ -10,7 +10,7 @@ namespace Server.Items public class LoomEastAddon : BaseAddon, ILoom { - public override BaseAddonDeed Deed{ get{ return new LoomEastDeed(); } } + public override BaseAddonDeed Deed => new LoomEastDeed(); private int m_Phase; @@ -55,8 +55,8 @@ namespace Server.Items public class LoomEastDeed : BaseAddonDeed { - public override BaseAddon Addon{ get{ return new LoomEastAddon(); } } - public override int LabelNumber{ get{ return 1044343; } } // loom (east) + public override BaseAddon Addon => new LoomEastAddon(); + public override int LabelNumber => 1044343; // loom (east) [Constructible] public LoomEastDeed() @@ -81,4 +81,4 @@ namespace Server.Items int version = reader.ReadInt(); } } -} \ No newline at end of file +} diff --git a/Scripts/Items/Addons/LoomSouthAddon.cs b/Scripts/Items/Addons/LoomSouthAddon.cs index 032fc56d3..a823657f7 100644 --- a/Scripts/Items/Addons/LoomSouthAddon.cs +++ b/Scripts/Items/Addons/LoomSouthAddon.cs @@ -5,7 +5,7 @@ namespace Server.Items { public class LoomSouthAddon : BaseAddon, ILoom { - public override BaseAddonDeed Deed{ get{ return new LoomSouthDeed(); } } + public override BaseAddonDeed Deed => new LoomSouthDeed(); private int m_Phase; @@ -50,8 +50,8 @@ namespace Server.Items public class LoomSouthDeed : BaseAddonDeed { - public override BaseAddon Addon{ get{ return new LoomSouthAddon(); } } - public override int LabelNumber{ get{ return 1044344; } } // loom (south) + public override BaseAddon Addon => new LoomSouthAddon(); + public override int LabelNumber => 1044344; // loom (south) [Constructible] public LoomSouthDeed() @@ -76,4 +76,4 @@ namespace Server.Items int version = reader.ReadInt(); } } -} \ No newline at end of file +} diff --git a/Scripts/Items/Addons/MediumStoneTableEastAddon.cs b/Scripts/Items/Addons/MediumStoneTableEastAddon.cs index 9920e0e55..ac1a22eb4 100644 --- a/Scripts/Items/Addons/MediumStoneTableEastAddon.cs +++ b/Scripts/Items/Addons/MediumStoneTableEastAddon.cs @@ -5,7 +5,7 @@ namespace Server.Items { public class MediumStoneTableEastAddon : BaseAddon { - public override BaseAddonDeed Deed{ get{ return new MediumStoneTableEastDeed(); } } + public override BaseAddonDeed Deed => new MediumStoneTableEastDeed(); public override bool RetainDeedHue => true; @@ -43,8 +43,8 @@ namespace Server.Items public class MediumStoneTableEastDeed : BaseAddonDeed { - public override BaseAddon Addon{ get{ return new MediumStoneTableEastAddon( this.Hue ); } } - public override int LabelNumber{ get{ return 1044508; } } // stone table (east) + public override BaseAddon Addon => new MediumStoneTableEastAddon( this.Hue ); + public override int LabelNumber => 1044508; // stone table (east) [Constructible] public MediumStoneTableEastDeed() diff --git a/Scripts/Items/Addons/MediumStoneTableSouthAddon.cs b/Scripts/Items/Addons/MediumStoneTableSouthAddon.cs index 177a07449..bda5fbfe5 100644 --- a/Scripts/Items/Addons/MediumStoneTableSouthAddon.cs +++ b/Scripts/Items/Addons/MediumStoneTableSouthAddon.cs @@ -5,7 +5,7 @@ namespace Server.Items { public class MediumStoneTableSouthAddon : BaseAddon { - public override BaseAddonDeed Deed{ get{ return new MediumStoneTableSouthDeed(); } } + public override BaseAddonDeed Deed => new MediumStoneTableSouthDeed(); public override bool RetainDeedHue => true; @@ -43,8 +43,8 @@ namespace Server.Items public class MediumStoneTableSouthDeed : BaseAddonDeed { - public override BaseAddon Addon{ get{ return new MediumStoneTableSouthAddon( Hue ); } } - public override int LabelNumber{ get{ return 1044509; } } // stone table (South) + public override BaseAddon Addon => new MediumStoneTableSouthAddon( Hue ); + public override int LabelNumber => 1044509; // stone table (South) [Constructible] public MediumStoneTableSouthDeed() diff --git a/Scripts/Items/Addons/OrnateElvenTableEastAddon.cs b/Scripts/Items/Addons/OrnateElvenTableEastAddon.cs index 859f08168..73aa925e1 100644 --- a/Scripts/Items/Addons/OrnateElvenTableEastAddon.cs +++ b/Scripts/Items/Addons/OrnateElvenTableEastAddon.cs @@ -5,7 +5,7 @@ namespace Server.Items { public class OrnateElvenTableEastAddon : BaseAddon { - public override BaseAddonDeed Deed{ get{ return new OrnateElvenTableEastDeed(); } } + public override BaseAddonDeed Deed => new OrnateElvenTableEastDeed(); [Constructible] public OrnateElvenTableEastAddon() @@ -36,8 +36,8 @@ namespace Server.Items public class OrnateElvenTableEastDeed : BaseAddonDeed { - public override BaseAddon Addon{ get{ return new OrnateElvenTableEastAddon(); } } - public override int LabelNumber{ get{ return 1073384; } } // ornate table (east) + public override BaseAddon Addon => new OrnateElvenTableEastAddon(); + public override int LabelNumber => 1073384; // ornate table (east) [Constructible] public OrnateElvenTableEastDeed() @@ -62,4 +62,4 @@ namespace Server.Items int version = reader.ReadEncodedInt(); } } -} \ No newline at end of file +} diff --git a/Scripts/Items/Addons/OrnateElvenTableSouthAddon.cs b/Scripts/Items/Addons/OrnateElvenTableSouthAddon.cs index fbbcee45d..78cfe2cf2 100644 --- a/Scripts/Items/Addons/OrnateElvenTableSouthAddon.cs +++ b/Scripts/Items/Addons/OrnateElvenTableSouthAddon.cs @@ -5,7 +5,7 @@ namespace Server.Items { public class OrnateElvenTableSouthAddon : BaseAddon { - public override BaseAddonDeed Deed{ get{ return new OrnateElvenTableSouthDeed(); } } + public override BaseAddonDeed Deed => new OrnateElvenTableSouthDeed(); [Constructible] public OrnateElvenTableSouthAddon() @@ -36,8 +36,8 @@ namespace Server.Items public class OrnateElvenTableSouthDeed : BaseAddonDeed { - public override BaseAddon Addon{ get{ return new OrnateElvenTableSouthAddon(); } } - public override int LabelNumber{ get{ return 1072869; } } // ornate table (south) + public override BaseAddon Addon => new OrnateElvenTableSouthAddon(); + public override int LabelNumber => 1072869; // ornate table (south) [Constructible] public OrnateElvenTableSouthDeed() @@ -62,4 +62,4 @@ namespace Server.Items int version = reader.ReadEncodedInt(); } } -} \ No newline at end of file +} diff --git a/Scripts/Items/Addons/ParrotPerchAddon.cs b/Scripts/Items/Addons/ParrotPerchAddon.cs index dbf18fb89..eb5a9168f 100644 --- a/Scripts/Items/Addons/ParrotPerchAddon.cs +++ b/Scripts/Items/Addons/ParrotPerchAddon.cs @@ -5,7 +5,7 @@ namespace Server.Items { public class ParrotPerchAddon : BaseAddon { - public override BaseAddonDeed Deed{ get{ return new ParrotPerchDeed(); } } + public override BaseAddonDeed Deed => new ParrotPerchDeed(); [Constructible] public ParrotPerchAddon() @@ -34,8 +34,8 @@ namespace Server.Items public class ParrotPerchDeed : BaseAddonDeed { - public override BaseAddon Addon{ get{ return new ParrotPerchAddon(); } } - public override int LabelNumber{ get{ return 1072617; } } // parrot perch + public override BaseAddon Addon => new ParrotPerchAddon(); + public override int LabelNumber => 1072617; // parrot perch [Constructible] public ParrotPerchDeed() @@ -60,4 +60,4 @@ namespace Server.Items int version = reader.ReadEncodedInt(); } } -} \ No newline at end of file +} diff --git a/Scripts/Items/Addons/PentagramAddon.cs b/Scripts/Items/Addons/PentagramAddon.cs index b022c0fba..e6bcbe6b9 100644 --- a/Scripts/Items/Addons/PentagramAddon.cs +++ b/Scripts/Items/Addons/PentagramAddon.cs @@ -5,7 +5,7 @@ namespace Server.Items { public class PentagramAddon : BaseAddon { - public override BaseAddonDeed Deed{ get{ return new PentagramDeed(); } } + public override BaseAddonDeed Deed => new PentagramDeed(); [Constructible] public PentagramAddon() @@ -42,8 +42,8 @@ namespace Server.Items public class PentagramDeed : BaseAddonDeed { - public override BaseAddon Addon{ get{ return new PentagramAddon(); } } - public override int LabelNumber{ get{ return 1044328; } } // pentagram + public override BaseAddon Addon => new PentagramAddon(); + public override int LabelNumber => 1044328; // pentagram [Constructible] public PentagramDeed() @@ -68,4 +68,4 @@ namespace Server.Items int version = reader.ReadInt(); } } -} \ No newline at end of file +} diff --git a/Scripts/Items/Addons/PickpocketDips.cs b/Scripts/Items/Addons/PickpocketDips.cs index 293c2034f..ca8ce7ca3 100644 --- a/Scripts/Items/Addons/PickpocketDips.cs +++ b/Scripts/Items/Addons/PickpocketDips.cs @@ -28,7 +28,7 @@ namespace Server.Items [CommandProperty( AccessLevel.GameMaster )] public bool Swinging { - get{ return ( m_Timer != null ); } + get{ return ( m_Timer != null ); } } public PickpocketDip( int itemID ) : base( itemID ) @@ -158,7 +158,7 @@ namespace Server.Items public class PickpocketDipEastAddon : BaseAddon { - public override BaseAddonDeed Deed{ get{ return new PickpocketDipEastDeed(); } } + public override BaseAddonDeed Deed => new PickpocketDipEastDeed(); [Constructible] public PickpocketDipEastAddon() @@ -187,8 +187,8 @@ namespace Server.Items public class PickpocketDipEastDeed : BaseAddonDeed { - public override BaseAddon Addon{ get{ return new PickpocketDipEastAddon(); } } - public override int LabelNumber{ get{ return 1044337; } } // pickpocket dip (east) + public override BaseAddon Addon => new PickpocketDipEastAddon(); + public override int LabelNumber => 1044337; // pickpocket dip (east) [Constructible] public PickpocketDipEastDeed() @@ -216,7 +216,7 @@ namespace Server.Items public class PickpocketDipSouthAddon : BaseAddon { - public override BaseAddonDeed Deed{ get{ return new PickpocketDipSouthDeed(); } } + public override BaseAddonDeed Deed => new PickpocketDipSouthDeed(); [Constructible] public PickpocketDipSouthAddon() @@ -245,8 +245,8 @@ namespace Server.Items public class PickpocketDipSouthDeed : BaseAddonDeed { - public override BaseAddon Addon{ get{ return new PickpocketDipSouthAddon(); } } - public override int LabelNumber{ get{ return 1044338; } } // pickpocket dip (south) + public override BaseAddon Addon => new PickpocketDipSouthAddon(); + public override int LabelNumber => 1044338; // pickpocket dip (south) [Constructible] public PickpocketDipSouthDeed() @@ -271,4 +271,4 @@ namespace Server.Items int version = reader.ReadInt(); } } -} \ No newline at end of file +} diff --git a/Scripts/Items/Addons/SHTeleporter.cs b/Scripts/Items/Addons/SHTeleporter.cs index 2937ea0af..1bddfd5e3 100644 --- a/Scripts/Items/Addons/SHTeleporter.cs +++ b/Scripts/Items/Addons/SHTeleporter.cs @@ -293,12 +293,12 @@ namespace Server.Items private bool m_Changing; [CommandProperty( AccessLevel.GameMaster )] - public bool External { get { return m_External; } } + public bool External => m_External; - public SHTeleComponent UpTele { get { return m_UpTele; } } - public SHTeleComponent RightTele { get { return m_RightTele; } } - public SHTeleComponent DownTele { get { return m_DownTele; } } - public SHTeleComponent LeftTele { get { return m_LeftTele; } } + public SHTeleComponent UpTele => m_UpTele; + public SHTeleComponent RightTele => m_RightTele; + public SHTeleComponent DownTele => m_DownTele; + public SHTeleComponent LeftTele => m_LeftTele; [Constructible] public SHTeleporter() : this( true ) @@ -353,7 +353,7 @@ namespace Server.Items m_Changing = false; } - public override bool ShareHue{ get { return false; } } + public override bool ShareHue => false; public void ChangeActive( bool active ) { diff --git a/Scripts/Items/Addons/SandstoneFireplaceEastAddon.cs b/Scripts/Items/Addons/SandstoneFireplaceEastAddon.cs index 04527f5cc..f1d10bfe7 100644 --- a/Scripts/Items/Addons/SandstoneFireplaceEastAddon.cs +++ b/Scripts/Items/Addons/SandstoneFireplaceEastAddon.cs @@ -5,7 +5,7 @@ namespace Server.Items { public class SandstoneFireplaceEastAddon : BaseAddon { - public override BaseAddonDeed Deed{ get{ return new SandstoneFireplaceEastDeed(); } } + public override BaseAddonDeed Deed => new SandstoneFireplaceEastDeed(); [Constructible] public SandstoneFireplaceEastAddon() @@ -35,8 +35,8 @@ namespace Server.Items public class SandstoneFireplaceEastDeed : BaseAddonDeed { - public override BaseAddon Addon{ get{ return new SandstoneFireplaceEastAddon(); } } - public override int LabelNumber{ get{ return 1061844; } } // sandstone fireplace (east) + public override BaseAddon Addon => new SandstoneFireplaceEastAddon(); + public override int LabelNumber => 1061844; // sandstone fireplace (east) [Constructible] public SandstoneFireplaceEastDeed() @@ -61,4 +61,4 @@ namespace Server.Items int version = reader.ReadInt(); } } -} \ No newline at end of file +} diff --git a/Scripts/Items/Addons/SandstoneFireplaceSouthAddon.cs b/Scripts/Items/Addons/SandstoneFireplaceSouthAddon.cs index cf66beb6e..a96d644dc 100644 --- a/Scripts/Items/Addons/SandstoneFireplaceSouthAddon.cs +++ b/Scripts/Items/Addons/SandstoneFireplaceSouthAddon.cs @@ -5,7 +5,7 @@ namespace Server.Items { public class SandstoneFireplaceSouthAddon : BaseAddon { - public override BaseAddonDeed Deed{ get{ return new SandstoneFireplaceSouthDeed(); } } + public override BaseAddonDeed Deed => new SandstoneFireplaceSouthDeed(); [Constructible] public SandstoneFireplaceSouthAddon() @@ -35,8 +35,8 @@ namespace Server.Items public class SandstoneFireplaceSouthDeed : BaseAddonDeed { - public override BaseAddon Addon{ get{ return new SandstoneFireplaceSouthAddon(); } } - public override int LabelNumber{ get{ return 1061845; } } // sandstone fireplace (south) + public override BaseAddon Addon => new SandstoneFireplaceSouthAddon(); + public override int LabelNumber => 1061845; // sandstone fireplace (south) [Constructible] public SandstoneFireplaceSouthDeed() @@ -61,4 +61,4 @@ namespace Server.Items int version = reader.ReadInt(); } } -} \ No newline at end of file +} diff --git a/Scripts/Items/Addons/ShrineOfWisdomAddon.cs b/Scripts/Items/Addons/ShrineOfWisdomAddon.cs index 50faf44f8..6599051c9 100644 --- a/Scripts/Items/Addons/ShrineOfWisdomAddon.cs +++ b/Scripts/Items/Addons/ShrineOfWisdomAddon.cs @@ -37,7 +37,7 @@ namespace Server.Items [Server.Engines.Craft.Forge] public class ShrineOfWisdomComponent : AddonComponent { - public override int LabelNumber{ get{ return 1062046; } } // Shrine of Wisdom + public override int LabelNumber => 1062046; // Shrine of Wisdom [Constructible] public ShrineOfWisdomComponent( int itemID ) : base( itemID ) @@ -62,4 +62,4 @@ namespace Server.Items int version = reader.ReadInt(); } } -} \ No newline at end of file +} diff --git a/Scripts/Items/Addons/SmallBedEastAddon.cs b/Scripts/Items/Addons/SmallBedEastAddon.cs index dda984503..043efe463 100644 --- a/Scripts/Items/Addons/SmallBedEastAddon.cs +++ b/Scripts/Items/Addons/SmallBedEastAddon.cs @@ -5,7 +5,7 @@ namespace Server.Items { public class SmallBedEastAddon : BaseAddon { - public override BaseAddonDeed Deed{ get{ return new SmallBedEastDeed(); } } + public override BaseAddonDeed Deed => new SmallBedEastDeed(); [Constructible] public SmallBedEastAddon() @@ -35,8 +35,8 @@ namespace Server.Items public class SmallBedEastDeed : BaseAddonDeed { - public override BaseAddon Addon{ get{ return new SmallBedEastAddon(); } } - public override int LabelNumber{ get{ return 1044322; } } // small bed (east) + public override BaseAddon Addon => new SmallBedEastAddon(); + public override int LabelNumber => 1044322; // small bed (east) [Constructible] public SmallBedEastDeed() @@ -61,4 +61,4 @@ namespace Server.Items int version = reader.ReadInt(); } } -} \ No newline at end of file +} diff --git a/Scripts/Items/Addons/SmallBedSouthAddon.cs b/Scripts/Items/Addons/SmallBedSouthAddon.cs index 27431254c..d58f1099c 100644 --- a/Scripts/Items/Addons/SmallBedSouthAddon.cs +++ b/Scripts/Items/Addons/SmallBedSouthAddon.cs @@ -5,7 +5,7 @@ namespace Server.Items { public class SmallBedSouthAddon : BaseAddon { - public override BaseAddonDeed Deed{ get{ return new SmallBedSouthDeed(); } } + public override BaseAddonDeed Deed => new SmallBedSouthDeed(); [Constructible] public SmallBedSouthAddon() @@ -35,8 +35,8 @@ namespace Server.Items public class SmallBedSouthDeed : BaseAddonDeed { - public override BaseAddon Addon{ get{ return new SmallBedSouthAddon(); } } - public override int LabelNumber{ get{ return 1044321; } } // small bed (south) + public override BaseAddon Addon => new SmallBedSouthAddon(); + public override int LabelNumber => 1044321; // small bed (south) [Constructible] public SmallBedSouthDeed() @@ -61,4 +61,4 @@ namespace Server.Items int version = reader.ReadInt(); } } -} \ No newline at end of file +} diff --git a/Scripts/Items/Addons/SmallForgeAddon.cs b/Scripts/Items/Addons/SmallForgeAddon.cs index c243659d1..26e8cb032 100644 --- a/Scripts/Items/Addons/SmallForgeAddon.cs +++ b/Scripts/Items/Addons/SmallForgeAddon.cs @@ -5,7 +5,7 @@ namespace Server.Items { public class SmallForgeAddon : BaseAddon { - public override BaseAddonDeed Deed{ get{ return new SmallForgeDeed(); } } + public override BaseAddonDeed Deed => new SmallForgeDeed(); [Constructible] public SmallForgeAddon() @@ -34,8 +34,8 @@ namespace Server.Items public class SmallForgeDeed : BaseAddonDeed { - public override BaseAddon Addon{ get{ return new SmallForgeAddon(); } } - public override int LabelNumber{ get{ return 1044330; } } // small forge + public override BaseAddon Addon => new SmallForgeAddon(); + public override int LabelNumber => 1044330; // small forge [Constructible] public SmallForgeDeed() @@ -60,4 +60,4 @@ namespace Server.Items int version = reader.ReadInt(); } } -} \ No newline at end of file +} diff --git a/Scripts/Items/Addons/SolenAntHole.cs b/Scripts/Items/Addons/SolenAntHole.cs index 966f7c00d..a9db14d00 100644 --- a/Scripts/Items/Addons/SolenAntHole.cs +++ b/Scripts/Items/Addons/SolenAntHole.cs @@ -57,7 +57,7 @@ namespace Server.Items private List m_Spawned; [Constructible] - public SolenAntHole() : base() + public SolenAntHole() { m_Spawned = new List(); diff --git a/Scripts/Items/Addons/SpinningwheelEastAddon.cs b/Scripts/Items/Addons/SpinningwheelEastAddon.cs index a6c92a1df..6fa853f75 100644 --- a/Scripts/Items/Addons/SpinningwheelEastAddon.cs +++ b/Scripts/Items/Addons/SpinningwheelEastAddon.cs @@ -13,7 +13,7 @@ namespace Server.Items public class SpinningwheelEastAddon : BaseAddon, ISpinningWheel { - public override BaseAddonDeed Deed{ get{ return new SpinningwheelEastDeed(); } } + public override BaseAddonDeed Deed => new SpinningwheelEastDeed(); [Constructible] public SpinningwheelEastAddon() @@ -118,8 +118,8 @@ namespace Server.Items public class SpinningwheelEastDeed : BaseAddonDeed { - public override BaseAddon Addon{ get{ return new SpinningwheelEastAddon(); } } - public override int LabelNumber{ get{ return 1044341; } } // spining wheel (east) + public override BaseAddon Addon => new SpinningwheelEastAddon(); + public override int LabelNumber => 1044341; // spining wheel (east) [Constructible] public SpinningwheelEastDeed() @@ -144,4 +144,4 @@ namespace Server.Items int version = reader.ReadInt(); } } -} \ No newline at end of file +} diff --git a/Scripts/Items/Addons/SpinningwheelSouthAddon.cs b/Scripts/Items/Addons/SpinningwheelSouthAddon.cs index f561dd42a..e3e45a6dd 100644 --- a/Scripts/Items/Addons/SpinningwheelSouthAddon.cs +++ b/Scripts/Items/Addons/SpinningwheelSouthAddon.cs @@ -5,7 +5,7 @@ namespace Server.Items { public class SpinningwheelSouthAddon : BaseAddon, ISpinningWheel { - public override BaseAddonDeed Deed{ get{ return new SpinningwheelSouthDeed(); } } + public override BaseAddonDeed Deed => new SpinningwheelSouthDeed(); [Constructible] public SpinningwheelSouthAddon() @@ -110,8 +110,8 @@ namespace Server.Items public class SpinningwheelSouthDeed : BaseAddonDeed { - public override BaseAddon Addon{ get{ return new SpinningwheelSouthAddon(); } } - public override int LabelNumber{ get{ return 1044342; } } // spining wheel (south) + public override BaseAddon Addon => new SpinningwheelSouthAddon(); + public override int LabelNumber => 1044342; // spining wheel (south) [Constructible] public SpinningwheelSouthDeed() @@ -136,4 +136,4 @@ namespace Server.Items int version = reader.ReadInt(); } } -} \ No newline at end of file +} diff --git a/Scripts/Items/Addons/SquirrelStatueEastAddon.cs b/Scripts/Items/Addons/SquirrelStatueEastAddon.cs index 15643d790..6c64f55f4 100644 --- a/Scripts/Items/Addons/SquirrelStatueEastAddon.cs +++ b/Scripts/Items/Addons/SquirrelStatueEastAddon.cs @@ -5,7 +5,7 @@ namespace Server.Items { public class SquirrelStatueEastAddon : BaseAddon { - public override BaseAddonDeed Deed{ get{ return new SquirrelStatueEastDeed(); } } + public override BaseAddonDeed Deed => new SquirrelStatueEastDeed(); [Constructible] public SquirrelStatueEastAddon() @@ -34,8 +34,8 @@ namespace Server.Items public class SquirrelStatueEastDeed : BaseAddonDeed { - public override BaseAddon Addon{ get{ return new SquirrelStatueEastAddon(); } } - public override int LabelNumber{ get{ return 1073398; } } // squirrel statue (east) + public override BaseAddon Addon => new SquirrelStatueEastAddon(); + public override int LabelNumber => 1073398; // squirrel statue (east) [Constructible] public SquirrelStatueEastDeed() @@ -60,4 +60,4 @@ namespace Server.Items int version = reader.ReadEncodedInt(); } } -} \ No newline at end of file +} diff --git a/Scripts/Items/Addons/SquirrelStatueSouthAddon.cs b/Scripts/Items/Addons/SquirrelStatueSouthAddon.cs index 5778f2c6f..388d6a7fd 100644 --- a/Scripts/Items/Addons/SquirrelStatueSouthAddon.cs +++ b/Scripts/Items/Addons/SquirrelStatueSouthAddon.cs @@ -5,7 +5,7 @@ namespace Server.Items { public class SquirrelStatueSouthAddon : BaseAddon { - public override BaseAddonDeed Deed{ get{ return new SquirrelStatueSouthDeed(); } } + public override BaseAddonDeed Deed => new SquirrelStatueSouthDeed(); [Constructible] public SquirrelStatueSouthAddon() @@ -34,8 +34,8 @@ namespace Server.Items public class SquirrelStatueSouthDeed : BaseAddonDeed { - public override BaseAddon Addon{ get{ return new SquirrelStatueSouthAddon(); } } - public override int LabelNumber{ get{ return 1072884; } } // squirrel statue (south) + public override BaseAddon Addon => new SquirrelStatueSouthAddon(); + public override int LabelNumber => 1072884; // squirrel statue (south) [Constructible] public SquirrelStatueSouthDeed() @@ -60,4 +60,4 @@ namespace Server.Items int version = reader.ReadEncodedInt(); } } -} \ No newline at end of file +} diff --git a/Scripts/Items/Addons/StoneFireplaceEastAddon.cs b/Scripts/Items/Addons/StoneFireplaceEastAddon.cs index a61fbdbe1..98629d265 100644 --- a/Scripts/Items/Addons/StoneFireplaceEastAddon.cs +++ b/Scripts/Items/Addons/StoneFireplaceEastAddon.cs @@ -5,7 +5,7 @@ namespace Server.Items { public class StoneFireplaceEastAddon : BaseAddon { - public override BaseAddonDeed Deed{ get{ return new StoneFireplaceEastDeed(); } } + public override BaseAddonDeed Deed => new StoneFireplaceEastDeed(); [Constructible] public StoneFireplaceEastAddon() @@ -35,8 +35,8 @@ namespace Server.Items public class StoneFireplaceEastDeed : BaseAddonDeed { - public override BaseAddon Addon{ get{ return new StoneFireplaceEastAddon(); } } - public override int LabelNumber{ get{ return 1061848; } } // stone fireplace (east) + public override BaseAddon Addon => new StoneFireplaceEastAddon(); + public override int LabelNumber => 1061848; // stone fireplace (east) [Constructible] public StoneFireplaceEastDeed() @@ -61,4 +61,4 @@ namespace Server.Items int version = reader.ReadInt(); } } -} \ No newline at end of file +} diff --git a/Scripts/Items/Addons/StoneFireplaceSouthAddon.cs b/Scripts/Items/Addons/StoneFireplaceSouthAddon.cs index 3554acfb1..2deb35297 100644 --- a/Scripts/Items/Addons/StoneFireplaceSouthAddon.cs +++ b/Scripts/Items/Addons/StoneFireplaceSouthAddon.cs @@ -5,7 +5,7 @@ namespace Server.Items { public class StoneFireplaceSouthAddon : BaseAddon { - public override BaseAddonDeed Deed{ get{ return new StoneFireplaceSouthDeed(); } } + public override BaseAddonDeed Deed => new StoneFireplaceSouthDeed(); [Constructible] public StoneFireplaceSouthAddon() @@ -35,8 +35,8 @@ namespace Server.Items public class StoneFireplaceSouthDeed : BaseAddonDeed { - public override BaseAddon Addon{ get{ return new StoneFireplaceSouthAddon(); } } - public override int LabelNumber{ get{ return 1061849; } } // stone fireplace (south) + public override BaseAddon Addon => new StoneFireplaceSouthAddon(); + public override int LabelNumber => 1061849; // stone fireplace (south) [Constructible] public StoneFireplaceSouthDeed() @@ -61,4 +61,4 @@ namespace Server.Items int version = reader.ReadInt(); } } -} \ No newline at end of file +} diff --git a/Scripts/Items/Addons/StoneOvenEastAddon.cs b/Scripts/Items/Addons/StoneOvenEastAddon.cs index 13fcbabee..0197134b8 100644 --- a/Scripts/Items/Addons/StoneOvenEastAddon.cs +++ b/Scripts/Items/Addons/StoneOvenEastAddon.cs @@ -5,7 +5,7 @@ namespace Server.Items { public class StoneOvenEastAddon : BaseAddon { - public override BaseAddonDeed Deed{ get{ return new StoneOvenEastDeed(); } } + public override BaseAddonDeed Deed => new StoneOvenEastDeed(); [Constructible] public StoneOvenEastAddon() @@ -35,8 +35,8 @@ namespace Server.Items public class StoneOvenEastDeed : BaseAddonDeed { - public override BaseAddon Addon{ get{ return new StoneOvenEastAddon(); } } - public override int LabelNumber{ get{ return 1044345; } } // stone oven (east) + public override BaseAddon Addon => new StoneOvenEastAddon(); + public override int LabelNumber => 1044345; // stone oven (east) [Constructible] public StoneOvenEastDeed() @@ -61,4 +61,4 @@ namespace Server.Items int version = reader.ReadInt(); } } -} \ No newline at end of file +} diff --git a/Scripts/Items/Addons/StoneOvenSouthAddon.cs b/Scripts/Items/Addons/StoneOvenSouthAddon.cs index 0c1e1b0f7..cd2b3495b 100644 --- a/Scripts/Items/Addons/StoneOvenSouthAddon.cs +++ b/Scripts/Items/Addons/StoneOvenSouthAddon.cs @@ -5,7 +5,7 @@ namespace Server.Items { public class StoneOvenSouthAddon : BaseAddon { - public override BaseAddonDeed Deed{ get{ return new StoneOvenSouthDeed(); } } + public override BaseAddonDeed Deed => new StoneOvenSouthDeed(); [Constructible] public StoneOvenSouthAddon() @@ -35,8 +35,8 @@ namespace Server.Items public class StoneOvenSouthDeed : BaseAddonDeed { - public override BaseAddon Addon{ get{ return new StoneOvenSouthAddon(); } } - public override int LabelNumber{ get{ return 1044346; } } // stone oven (south) + public override BaseAddon Addon => new StoneOvenSouthAddon(); + public override int LabelNumber => 1044346; // stone oven (south) [Constructible] public StoneOvenSouthDeed() @@ -61,4 +61,4 @@ namespace Server.Items int version = reader.ReadInt(); } } -} \ No newline at end of file +} diff --git a/Scripts/Items/Addons/StretchedHides.cs b/Scripts/Items/Addons/StretchedHides.cs index e29c330c8..8d05d805e 100644 --- a/Scripts/Items/Addons/StretchedHides.cs +++ b/Scripts/Items/Addons/StretchedHides.cs @@ -5,7 +5,7 @@ namespace Server.Items { public class SmallStretchedHideEastAddon : BaseAddon { - public override BaseAddonDeed Deed{ get{ return new SmallStretchedHideEastDeed(); } } + public override BaseAddonDeed Deed => new SmallStretchedHideEastDeed(); [Constructible] public SmallStretchedHideEastAddon() @@ -34,8 +34,8 @@ namespace Server.Items public class SmallStretchedHideEastDeed : BaseAddonDeed { - public override BaseAddon Addon{ get{ return new SmallStretchedHideEastAddon(); } } - public override int LabelNumber{ get{ return 1049401; } } // a small stretched hide deed facing east + public override BaseAddon Addon => new SmallStretchedHideEastAddon(); + public override int LabelNumber => 1049401; // a small stretched hide deed facing east [Constructible] public SmallStretchedHideEastDeed() @@ -63,7 +63,7 @@ namespace Server.Items public class SmallStretchedHideSouthAddon : BaseAddon { - public override BaseAddonDeed Deed{ get{ return new SmallStretchedHideSouthDeed(); } } + public override BaseAddonDeed Deed => new SmallStretchedHideSouthDeed(); [Constructible] public SmallStretchedHideSouthAddon() @@ -92,8 +92,8 @@ namespace Server.Items public class SmallStretchedHideSouthDeed : BaseAddonDeed { - public override BaseAddon Addon{ get{ return new SmallStretchedHideSouthAddon(); } } - public override int LabelNumber{ get{ return 1049402; } } // a small stretched hide deed facing south + public override BaseAddon Addon => new SmallStretchedHideSouthAddon(); + public override int LabelNumber => 1049402; // a small stretched hide deed facing south [Constructible] public SmallStretchedHideSouthDeed() @@ -121,7 +121,7 @@ namespace Server.Items public class MediumStretchedHideEastAddon : BaseAddon { - public override BaseAddonDeed Deed{ get{ return new MediumStretchedHideEastDeed(); } } + public override BaseAddonDeed Deed => new MediumStretchedHideEastDeed(); [Constructible] public MediumStretchedHideEastAddon() @@ -150,8 +150,8 @@ namespace Server.Items public class MediumStretchedHideEastDeed : BaseAddonDeed { - public override BaseAddon Addon{ get{ return new MediumStretchedHideEastAddon(); } } - public override int LabelNumber{ get{ return 1049403; } } // a medium stretched hide deed facing east + public override BaseAddon Addon => new MediumStretchedHideEastAddon(); + public override int LabelNumber => 1049403; // a medium stretched hide deed facing east [Constructible] public MediumStretchedHideEastDeed() @@ -179,7 +179,7 @@ namespace Server.Items public class MediumStretchedHideSouthAddon : BaseAddon { - public override BaseAddonDeed Deed{ get{ return new MediumStretchedHideSouthDeed(); } } + public override BaseAddonDeed Deed => new MediumStretchedHideSouthDeed(); [Constructible] public MediumStretchedHideSouthAddon() @@ -208,8 +208,8 @@ namespace Server.Items public class MediumStretchedHideSouthDeed : BaseAddonDeed { - public override BaseAddon Addon{ get{ return new MediumStretchedHideSouthAddon(); } } - public override int LabelNumber{ get{ return 1049404; } } // a medium stretched hide deed facing south + public override BaseAddon Addon => new MediumStretchedHideSouthAddon(); + public override int LabelNumber => 1049404; // a medium stretched hide deed facing south [Constructible] public MediumStretchedHideSouthDeed() @@ -234,4 +234,4 @@ namespace Server.Items int version = reader.ReadInt(); } } -} \ No newline at end of file +} diff --git a/Scripts/Items/Addons/TallElvenBedEastAddon.cs b/Scripts/Items/Addons/TallElvenBedEastAddon.cs index 0053e1aba..2f621dfd8 100644 --- a/Scripts/Items/Addons/TallElvenBedEastAddon.cs +++ b/Scripts/Items/Addons/TallElvenBedEastAddon.cs @@ -5,7 +5,7 @@ namespace Server.Items { public class TallElvenBedEastAddon : BaseAddon { - public override BaseAddonDeed Deed{ get{ return new TallElvenBedEastDeed(); } } + public override BaseAddonDeed Deed => new TallElvenBedEastDeed(); [Constructible] public TallElvenBedEastAddon() @@ -37,8 +37,8 @@ namespace Server.Items public class TallElvenBedEastDeed : BaseAddonDeed { - public override BaseAddon Addon{ get{ return new TallElvenBedEastAddon(); } } - public override int LabelNumber{ get{ return 1072859; } } // tall elven bed (east) + public override BaseAddon Addon => new TallElvenBedEastAddon(); + public override int LabelNumber => 1072859; // tall elven bed (east) [Constructible] public TallElvenBedEastDeed() @@ -63,4 +63,4 @@ namespace Server.Items int version = reader.ReadEncodedInt(); } } -} \ No newline at end of file +} diff --git a/Scripts/Items/Addons/TallElvenBedSouthAddon.cs b/Scripts/Items/Addons/TallElvenBedSouthAddon.cs index 9de1eb31e..71a45f70e 100644 --- a/Scripts/Items/Addons/TallElvenBedSouthAddon.cs +++ b/Scripts/Items/Addons/TallElvenBedSouthAddon.cs @@ -5,7 +5,7 @@ namespace Server.Items { public class TallElvenBedSouthAddon : BaseAddon { - public override BaseAddonDeed Deed{ get{ return new TallElvenBedSouthDeed(); } } + public override BaseAddonDeed Deed => new TallElvenBedSouthDeed(); [Constructible] public TallElvenBedSouthAddon() @@ -37,8 +37,8 @@ namespace Server.Items public class TallElvenBedSouthDeed : BaseAddonDeed { - public override BaseAddon Addon{ get{ return new TallElvenBedSouthAddon(); } } - public override int LabelNumber{ get{ return 1072858; } } // tall elven bed (south) + public override BaseAddon Addon => new TallElvenBedSouthAddon(); + public override int LabelNumber => 1072858; // tall elven bed (south) [Constructible] public TallElvenBedSouthDeed() @@ -63,4 +63,4 @@ namespace Server.Items int version = reader.ReadEncodedInt(); } } -} \ No newline at end of file +} diff --git a/Scripts/Items/Addons/TrainingDummies.cs b/Scripts/Items/Addons/TrainingDummies.cs index 0585131d3..130cd824e 100644 --- a/Scripts/Items/Addons/TrainingDummies.cs +++ b/Scripts/Items/Addons/TrainingDummies.cs @@ -28,7 +28,7 @@ namespace Server.Items [CommandProperty( AccessLevel.GameMaster )] public bool Swinging { - get{ return ( m_Timer != null ); } + get{ return ( m_Timer != null ); } } [Constructible] @@ -168,7 +168,7 @@ namespace Server.Items public class TrainingDummyEastAddon : BaseAddon { - public override BaseAddonDeed Deed{ get{ return new TrainingDummyEastDeed(); } } + public override BaseAddonDeed Deed => new TrainingDummyEastDeed(); [Constructible] public TrainingDummyEastAddon() @@ -197,8 +197,8 @@ namespace Server.Items public class TrainingDummyEastDeed : BaseAddonDeed { - public override BaseAddon Addon{ get{ return new TrainingDummyEastAddon(); } } - public override int LabelNumber{ get{ return 1044335; } } // training dummy (east) + public override BaseAddon Addon => new TrainingDummyEastAddon(); + public override int LabelNumber => 1044335; // training dummy (east) [Constructible] public TrainingDummyEastDeed() @@ -226,7 +226,7 @@ namespace Server.Items public class TrainingDummySouthAddon : BaseAddon { - public override BaseAddonDeed Deed{ get{ return new TrainingDummySouthDeed(); } } + public override BaseAddonDeed Deed => new TrainingDummySouthDeed(); [Constructible] public TrainingDummySouthAddon() @@ -255,8 +255,8 @@ namespace Server.Items public class TrainingDummySouthDeed : BaseAddonDeed { - public override BaseAddon Addon{ get{ return new TrainingDummySouthAddon(); } } - public override int LabelNumber{ get{ return 1044336; } } // training dummy (south) + public override BaseAddon Addon => new TrainingDummySouthAddon(); + public override int LabelNumber => 1044336; // training dummy (south) [Constructible] public TrainingDummySouthDeed() @@ -281,4 +281,4 @@ namespace Server.Items int version = reader.ReadInt(); } } -} \ No newline at end of file +} diff --git a/Scripts/Items/Addons/WarriorStatueEastAddon.cs b/Scripts/Items/Addons/WarriorStatueEastAddon.cs index f66cf8612..1e8a41e91 100644 --- a/Scripts/Items/Addons/WarriorStatueEastAddon.cs +++ b/Scripts/Items/Addons/WarriorStatueEastAddon.cs @@ -5,7 +5,7 @@ namespace Server.Items { public class WarriorStatueEastAddon : BaseAddon { - public override BaseAddonDeed Deed{ get{ return new WarriorStatueEastDeed(); } } + public override BaseAddonDeed Deed => new WarriorStatueEastDeed(); [Constructible] public WarriorStatueEastAddon() @@ -34,8 +34,8 @@ namespace Server.Items public class WarriorStatueEastDeed : BaseAddonDeed { - public override BaseAddon Addon{ get{ return new WarriorStatueEastAddon(); } } - public override int LabelNumber{ get{ return 1072888; } } // warrior statue (east) + public override BaseAddon Addon => new WarriorStatueEastAddon(); + public override int LabelNumber => 1072888; // warrior statue (east) [Constructible] public WarriorStatueEastDeed() @@ -60,4 +60,4 @@ namespace Server.Items int version = reader.ReadEncodedInt(); } } -} \ No newline at end of file +} diff --git a/Scripts/Items/Addons/WarriorStatueSouthAddon.cs b/Scripts/Items/Addons/WarriorStatueSouthAddon.cs index d04a51cc9..3106780ad 100644 --- a/Scripts/Items/Addons/WarriorStatueSouthAddon.cs +++ b/Scripts/Items/Addons/WarriorStatueSouthAddon.cs @@ -5,7 +5,7 @@ namespace Server.Items { public class WarriorStatueSouthAddon : BaseAddon { - public override BaseAddonDeed Deed{ get{ return new WarriorStatueSouthDeed(); } } + public override BaseAddonDeed Deed => new WarriorStatueSouthDeed(); [Constructible] public WarriorStatueSouthAddon() @@ -34,8 +34,8 @@ namespace Server.Items public class WarriorStatueSouthDeed : BaseAddonDeed { - public override BaseAddon Addon{ get{ return new WarriorStatueSouthAddon(); } } - public override int LabelNumber{ get{ return 1072887; } } // warrior statue (south) + public override BaseAddon Addon => new WarriorStatueSouthAddon(); + public override int LabelNumber => 1072887; // warrior statue (south) [Constructible] public WarriorStatueSouthDeed() @@ -60,4 +60,4 @@ namespace Server.Items int version = reader.ReadEncodedInt(); } } -} \ No newline at end of file +} diff --git a/Scripts/Items/Addons/WaterTroughEastAddon.cs b/Scripts/Items/Addons/WaterTroughEastAddon.cs index 07d2747f9..9c0722e8c 100644 --- a/Scripts/Items/Addons/WaterTroughEastAddon.cs +++ b/Scripts/Items/Addons/WaterTroughEastAddon.cs @@ -5,7 +5,7 @@ namespace Server.Items { public class WaterTroughEastAddon : BaseAddon, IWaterSource { - public override BaseAddonDeed Deed{ get{ return new WaterTroughEastDeed(); } } + public override BaseAddonDeed Deed => new WaterTroughEastDeed(); [Constructible] public WaterTroughEastAddon() @@ -41,8 +41,8 @@ namespace Server.Items public class WaterTroughEastDeed : BaseAddonDeed { - public override BaseAddon Addon{ get{ return new WaterTroughEastAddon(); } } - public override int LabelNumber{ get{ return 1044349; } } // water trough (east) + public override BaseAddon Addon => new WaterTroughEastAddon(); + public override int LabelNumber => 1044349; // water trough (east) [Constructible] public WaterTroughEastDeed() @@ -67,4 +67,4 @@ namespace Server.Items int version = reader.ReadInt(); } } -} \ No newline at end of file +} diff --git a/Scripts/Items/Addons/WaterTroughSouthAddon.cs b/Scripts/Items/Addons/WaterTroughSouthAddon.cs index bb2ea49bb..e213cca33 100644 --- a/Scripts/Items/Addons/WaterTroughSouthAddon.cs +++ b/Scripts/Items/Addons/WaterTroughSouthAddon.cs @@ -5,7 +5,7 @@ namespace Server.Items { public class WaterTroughSouthAddon : BaseAddon, IWaterSource { - public override BaseAddonDeed Deed{ get{ return new WaterTroughSouthDeed(); } } + public override BaseAddonDeed Deed => new WaterTroughSouthDeed(); [Constructible] public WaterTroughSouthAddon() @@ -41,8 +41,8 @@ namespace Server.Items public class WaterTroughSouthDeed : BaseAddonDeed { - public override BaseAddon Addon{ get{ return new WaterTroughSouthAddon(); } } - public override int LabelNumber{ get{ return 1044350; } } // water trough (south) + public override BaseAddon Addon => new WaterTroughSouthAddon(); + public override int LabelNumber => 1044350; // water trough (south) [Constructible] public WaterTroughSouthDeed() @@ -67,4 +67,4 @@ namespace Server.Items int version = reader.ReadInt(); } } -} \ No newline at end of file +} diff --git a/Scripts/Items/Aquarium/Aquarium.cs b/Scripts/Items/Aquarium/Aquarium.cs index 694c76e2a..07013ad7e 100644 --- a/Scripts/Items/Aquarium/Aquarium.cs +++ b/Scripts/Items/Aquarium/Aquarium.cs @@ -132,7 +132,7 @@ namespace Server.Items } } - public override double DefaultWeight{ get{ return 10.0; } } + public override double DefaultWeight => 10.0; public Aquarium( int itemID ) : base( itemID ) { @@ -342,9 +342,9 @@ namespace Server.Items this.LabelTo( from, 1074251, "#" + WaterNumber() ); // Water state: ~1_STATE~ if ( m_Food.State == (int) FoodState.Dead ) - this.LabelTo( from, 1074577, String.Format("{0}\t{1}", m_Food.Added, m_Food.Improve) ); // Food Added: ~1_CUR~ Needed: ~2_NEED~ + this.LabelTo( from, 1074577, String.Format("{0}\t{1}", m_Food.Added, m_Food.Improve) ); // Food Added: ~1_CUR~ Needed: ~2_NEED~ else if ( m_Food.State == (int) FoodState.Overfed ) - this.LabelTo( from, 1074577, String.Format("{0}\t{1}", m_Food.Added, m_Food.Maintain) ); // Food Added: ~1_CUR~ Needed: ~2_NEED~ + this.LabelTo( from, 1074577, String.Format("{0}\t{1}", m_Food.Added, m_Food.Maintain) ); // Food Added: ~1_CUR~ Needed: ~2_NEED~ else this.LabelTo( from, 1074253, String.Format("{0}\t{1}\t{2}", m_Food.Added, m_Food.Maintain, m_Food.Improve) ); // Food Added: ~1_CUR~ Feed: ~2_NEED~ Improve: ~3_GROW~ @@ -1152,11 +1152,11 @@ namespace Server.Items public class AquariumEastDeed : BaseAddonContainerDeed { - public override BaseAddonContainer Addon{ get{ return new Aquarium( 0x3062 ); } } - public override int LabelNumber{ get{ return 1074501; } } // Large Aquarium (east) + public override BaseAddonContainer Addon => new Aquarium( 0x3062 ); + public override int LabelNumber => 1074501; // Large Aquarium (east) [Constructible] - public AquariumEastDeed() : base() + public AquariumEastDeed() { } @@ -1181,11 +1181,11 @@ namespace Server.Items public class AquariumNorthDeed : BaseAddonContainerDeed { - public override BaseAddonContainer Addon{ get{ return new Aquarium( 0x3060 ); } } - public override int LabelNumber{ get{ return 1074497; } } // Large Aquarium (north) + public override BaseAddonContainer Addon => new Aquarium( 0x3060 ); + public override int LabelNumber => 1074497; // Large Aquarium (north) [Constructible] - public AquariumNorthDeed() : base() + public AquariumNorthDeed() { } diff --git a/Scripts/Items/Aquarium/AquariumFishingNet.cs b/Scripts/Items/Aquarium/AquariumFishingNet.cs index dcfa2315e..4d010bebe 100644 --- a/Scripts/Items/Aquarium/AquariumFishingNet.cs +++ b/Scripts/Items/Aquarium/AquariumFishingNet.cs @@ -8,7 +8,7 @@ namespace Server.Items { public class AquariumFishNet : SpecialFishingNet { - public override int LabelNumber{ get{ return 1074463; } } // An aquarium fishing net + public override int LabelNumber => 1074463; // An aquarium fishing net [Constructible] public AquariumFishNet() @@ -137,7 +137,7 @@ namespace Server.Items // Legacy code public class AquariumFishingNet : Item { - public override int LabelNumber{ get{ return 1074463; } } // An aquarium fishing net + public override int LabelNumber => 1074463; // An aquarium fishing net public AquariumFishingNet() { diff --git a/Scripts/Items/Aquarium/AquariumFood.cs b/Scripts/Items/Aquarium/AquariumFood.cs index 3a86eb69b..01346f6c8 100644 --- a/Scripts/Items/Aquarium/AquariumFood.cs +++ b/Scripts/Items/Aquarium/AquariumFood.cs @@ -5,9 +5,9 @@ using Server.Mobiles; namespace Server.Items { public class AquariumFood : Item - { - public override int LabelNumber{ get{ return 1074819; } } // Aquarium food - + { + public override int LabelNumber => 1074819; // Aquarium food + [Constructible] public AquariumFood() : base( 0xEFC ) { @@ -15,7 +15,7 @@ namespace Server.Items public AquariumFood( Serial serial ) : base( serial ) { - + } public override void Serialize( GenericWriter writer ) diff --git a/Scripts/Items/Aquarium/Fish/AlbinoCourtesanFish.cs b/Scripts/Items/Aquarium/Fish/AlbinoCourtesanFish.cs index 2d34beafe..d8b8907f3 100644 --- a/Scripts/Items/Aquarium/Fish/AlbinoCourtesanFish.cs +++ b/Scripts/Items/Aquarium/Fish/AlbinoCourtesanFish.cs @@ -4,16 +4,16 @@ using Server; namespace Server.Items { public class AlbinoCourtesanFish : BaseFish - { - public override int LabelNumber{ get{ return 1074592; } } // Albino Courtesan Fish - + { + public override int LabelNumber => 1074592; // Albino Courtesan Fish + [Constructible] public AlbinoCourtesanFish() : base( 0x3B04 ) { } public AlbinoCourtesanFish( Serial serial ) : base( serial ) - { + { } public override void Serialize( GenericWriter writer ) diff --git a/Scripts/Items/Aquarium/Fish/AlbinoFrog.cs b/Scripts/Items/Aquarium/Fish/AlbinoFrog.cs index 79bd755b0..6728802c3 100644 --- a/Scripts/Items/Aquarium/Fish/AlbinoFrog.cs +++ b/Scripts/Items/Aquarium/Fish/AlbinoFrog.cs @@ -4,9 +4,9 @@ using Server; namespace Server.Items { public class AlbinoFrog : BaseFish - { - public override int LabelNumber{ get{ return 1073824; } } // An Albino Frog - + { + public override int LabelNumber => 1073824; // An Albino Frog + [Constructible] public AlbinoFrog() : base( 0x3B0D ) { @@ -14,7 +14,7 @@ namespace Server.Items } public AlbinoFrog( Serial serial ) : base( serial ) - { + { } public override void Serialize( GenericWriter writer ) diff --git a/Scripts/Items/Aquarium/Fish/BritainCrownFish.cs b/Scripts/Items/Aquarium/Fish/BritainCrownFish.cs index c7d5b63b9..981d895a0 100644 --- a/Scripts/Items/Aquarium/Fish/BritainCrownFish.cs +++ b/Scripts/Items/Aquarium/Fish/BritainCrownFish.cs @@ -4,16 +4,16 @@ using Server; namespace Server.Items { public class BritainCrownFish : BaseFish - { - public override int LabelNumber{ get{ return 1074589; } } // Britain Crown Fish - + { + public override int LabelNumber => 1074589; // Britain Crown Fish + [Constructible] public BritainCrownFish() : base( 0x3AFF ) { } public BritainCrownFish( Serial serial ) : base( serial ) - { + { } public override void Serialize( GenericWriter writer ) diff --git a/Scripts/Items/Aquarium/Fish/FandancerFish.cs b/Scripts/Items/Aquarium/Fish/FandancerFish.cs index 9e018a840..b3684dadf 100644 --- a/Scripts/Items/Aquarium/Fish/FandancerFish.cs +++ b/Scripts/Items/Aquarium/Fish/FandancerFish.cs @@ -4,16 +4,16 @@ using Server; namespace Server.Items { public class FandancerFish : BaseFish - { - public override int LabelNumber{ get{ return 1074591; } } // Fandancer Fish - + { + public override int LabelNumber => 1074591; // Fandancer Fish + [Constructible] public FandancerFish() : base( 0x3B02 ) { } public FandancerFish( Serial serial ) : base( serial ) - { + { } public override void Serialize( GenericWriter writer ) diff --git a/Scripts/Items/Aquarium/Fish/GoldenBroadtail.cs b/Scripts/Items/Aquarium/Fish/GoldenBroadtail.cs index ded510174..38e997769 100644 --- a/Scripts/Items/Aquarium/Fish/GoldenBroadtail.cs +++ b/Scripts/Items/Aquarium/Fish/GoldenBroadtail.cs @@ -4,16 +4,16 @@ using Server; namespace Server.Items { public class GoldenBroadtail : BaseFish - { - public override int LabelNumber{ get{ return 1073828; } } // A Golden Broadtail - + { + public override int LabelNumber => 1073828; // A Golden Broadtail + [Constructible] public GoldenBroadtail() : base( 0x3B03 ) { } public GoldenBroadtail( Serial serial ) : base( serial ) - { + { } public override void Serialize( GenericWriter writer ) diff --git a/Scripts/Items/Aquarium/Fish/Jellyfish.cs b/Scripts/Items/Aquarium/Fish/Jellyfish.cs index 1432d6c76..de25b2cf1 100644 --- a/Scripts/Items/Aquarium/Fish/Jellyfish.cs +++ b/Scripts/Items/Aquarium/Fish/Jellyfish.cs @@ -4,16 +4,16 @@ using Server; namespace Server.Items { public class Jellyfish : BaseFish - { - public override int LabelNumber{ get{ return 1074593; } } // Jellyfish - + { + public override int LabelNumber => 1074593; // Jellyfish + [Constructible] public Jellyfish() : base( 0x3B0E ) { } public Jellyfish( Serial serial ) : base( serial ) - { + { } public override void Serialize( GenericWriter writer ) diff --git a/Scripts/Items/Aquarium/Fish/KillerFrog.cs b/Scripts/Items/Aquarium/Fish/KillerFrog.cs index 25809644a..e89a7f72f 100644 --- a/Scripts/Items/Aquarium/Fish/KillerFrog.cs +++ b/Scripts/Items/Aquarium/Fish/KillerFrog.cs @@ -4,16 +4,16 @@ using Server; namespace Server.Items { public class KillerFrog : BaseFish - { - public override int LabelNumber{ get{ return 1073825; } } // A Killer Frog - + { + public override int LabelNumber => 1073825; // A Killer Frog + [Constructible] public KillerFrog() : base( 0x3B0D ) { } public KillerFrog( Serial serial ) : base( serial ) - { + { } public override void Serialize( GenericWriter writer ) diff --git a/Scripts/Items/Aquarium/Fish/LongClawCrab.cs b/Scripts/Items/Aquarium/Fish/LongClawCrab.cs index cd42fb2dc..b7eb384ef 100644 --- a/Scripts/Items/Aquarium/Fish/LongClawCrab.cs +++ b/Scripts/Items/Aquarium/Fish/LongClawCrab.cs @@ -4,9 +4,9 @@ using Server; namespace Server.Items { public class LongClawCrab : BaseFish - { - public override int LabelNumber{ get{ return 1073827; } } // A Long Claw Crab - + { + public override int LabelNumber => 1073827; // A Long Claw Crab + [Constructible] public LongClawCrab() : base( 0x3AFC ) { @@ -14,7 +14,7 @@ namespace Server.Items } public LongClawCrab( Serial serial ) : base( serial ) - { + { } public override void Serialize( GenericWriter writer ) diff --git a/Scripts/Items/Aquarium/Fish/MakotoCourtesanFish.cs b/Scripts/Items/Aquarium/Fish/MakotoCourtesanFish.cs index 635923989..2c97ef32d 100644 --- a/Scripts/Items/Aquarium/Fish/MakotoCourtesanFish.cs +++ b/Scripts/Items/Aquarium/Fish/MakotoCourtesanFish.cs @@ -4,16 +4,16 @@ using Server; namespace Server.Items { public class MakotoCourtesanFish : BaseFish - { - public override int LabelNumber{ get{ return 1073835; } } // A Makoto Courtesan Fish - + { + public override int LabelNumber => 1073835; // A Makoto Courtesan Fish + [Constructible] public MakotoCourtesanFish() : base( 0x3AFD ) { } public MakotoCourtesanFish( Serial serial ) : base( serial ) - { + { } public override void Serialize( GenericWriter writer ) diff --git a/Scripts/Items/Aquarium/Fish/MinocBlueFish.cs b/Scripts/Items/Aquarium/Fish/MinocBlueFish.cs index 6535ffcba..42c4b01fc 100644 --- a/Scripts/Items/Aquarium/Fish/MinocBlueFish.cs +++ b/Scripts/Items/Aquarium/Fish/MinocBlueFish.cs @@ -4,16 +4,16 @@ using Server; namespace Server.Items { public class MinocBlueFish : BaseFish - { - public override int LabelNumber{ get{ return 1073829; } } // A Minoc Blue Fish - + { + public override int LabelNumber => 1073829; // A Minoc Blue Fish + [Constructible] public MinocBlueFish() : base( 0x3AFE ) { } public MinocBlueFish( Serial serial ) : base( serial ) - { + { } public override void Serialize( GenericWriter writer ) diff --git a/Scripts/Items/Aquarium/Fish/NujelmHoneyFish.cs b/Scripts/Items/Aquarium/Fish/NujelmHoneyFish.cs index d7e9e87e2..1c8d2430e 100644 --- a/Scripts/Items/Aquarium/Fish/NujelmHoneyFish.cs +++ b/Scripts/Items/Aquarium/Fish/NujelmHoneyFish.cs @@ -4,16 +4,16 @@ using Server; namespace Server.Items { public class NujelmHoneyFish : BaseFish - { - public override int LabelNumber{ get{ return 1073830; } } // A Nujel'm Honey Fish - + { + public override int LabelNumber => 1073830; // A Nujel'm Honey Fish + [Constructible] public NujelmHoneyFish() : base( 0x3B06 ) { } public NujelmHoneyFish( Serial serial ) : base( serial ) - { + { } public override void Serialize( GenericWriter writer ) diff --git a/Scripts/Items/Aquarium/Fish/PurpleFrog.cs b/Scripts/Items/Aquarium/Fish/PurpleFrog.cs index 311de280b..634e17746 100644 --- a/Scripts/Items/Aquarium/Fish/PurpleFrog.cs +++ b/Scripts/Items/Aquarium/Fish/PurpleFrog.cs @@ -4,9 +4,9 @@ using Server; namespace Server.Items { public class PurpleFrog : BaseFish - { - public override int LabelNumber{ get{ return 1073823; } } // A Purple Frog - + { + public override int LabelNumber => 1073823; // A Purple Frog + [Constructible] public PurpleFrog() : base( 0x3B0D ) { @@ -14,7 +14,7 @@ namespace Server.Items } public PurpleFrog( Serial serial ) : base( serial ) - { + { } public override void Serialize( GenericWriter writer ) diff --git a/Scripts/Items/Aquarium/Fish/RedDartFish.cs b/Scripts/Items/Aquarium/Fish/RedDartFish.cs index dece4480e..9f681be45 100644 --- a/Scripts/Items/Aquarium/Fish/RedDartFish.cs +++ b/Scripts/Items/Aquarium/Fish/RedDartFish.cs @@ -4,16 +4,16 @@ using Server; namespace Server.Items { public class RedDartFish : BaseFish - { - public override int LabelNumber{ get{ return 1073834; } } // A Red Dart Fish - + { + public override int LabelNumber => 1073834; // A Red Dart Fish + [Constructible] public RedDartFish() : base( 0x3B00 ) { } public RedDartFish( Serial serial ) : base( serial ) - { + { } public override void Serialize( GenericWriter writer ) diff --git a/Scripts/Items/Aquarium/Fish/Shrimp.cs b/Scripts/Items/Aquarium/Fish/Shrimp.cs index ea9626162..fad4139a9 100644 --- a/Scripts/Items/Aquarium/Fish/Shrimp.cs +++ b/Scripts/Items/Aquarium/Fish/Shrimp.cs @@ -4,16 +4,16 @@ using Server; namespace Server.Items { public class Shrimp : BaseFish - { - public override int LabelNumber{ get{ return 1074596; } } // Shrimp - + { + public override int LabelNumber => 1074596; // Shrimp + [Constructible] public Shrimp() : base( 0x3B14 ) { } public Shrimp( Serial serial ) : base( serial ) - { + { } public override void Serialize( GenericWriter writer ) diff --git a/Scripts/Items/Aquarium/Fish/SmallMouthSuckerFin.cs b/Scripts/Items/Aquarium/Fish/SmallMouthSuckerFin.cs index a0a4c1bef..49d116ffe 100644 --- a/Scripts/Items/Aquarium/Fish/SmallMouthSuckerFin.cs +++ b/Scripts/Items/Aquarium/Fish/SmallMouthSuckerFin.cs @@ -4,16 +4,16 @@ using Server; namespace Server.Items { public class SmallMouthSuckerFin : BaseFish - { - public override int LabelNumber{ get{ return 1074590; } } // Small Mouth Sucker Fin - + { + public override int LabelNumber => 1074590; // Small Mouth Sucker Fin + [Constructible] public SmallMouthSuckerFin() : base( 0x3B01 ) { } public SmallMouthSuckerFin( Serial serial ) : base( serial ) - { + { } public override void Serialize( GenericWriter writer ) diff --git a/Scripts/Items/Aquarium/Fish/SpeckledCrab.cs b/Scripts/Items/Aquarium/Fish/SpeckledCrab.cs index 5d576e11d..8a88a5a0b 100644 --- a/Scripts/Items/Aquarium/Fish/SpeckledCrab.cs +++ b/Scripts/Items/Aquarium/Fish/SpeckledCrab.cs @@ -4,16 +4,16 @@ using Server; namespace Server.Items { public class SpeckledCrab : BaseFish - { - public override int LabelNumber{ get{ return 1073826; } } // A Speckled Crab - + { + public override int LabelNumber => 1073826; // A Speckled Crab + [Constructible] public SpeckledCrab() : base( 0x3AFC ) { } public SpeckledCrab( Serial serial ) : base( serial ) - { + { } public override void Serialize( GenericWriter writer ) diff --git a/Scripts/Items/Aquarium/Fish/SpinedScratcherFish.cs b/Scripts/Items/Aquarium/Fish/SpinedScratcherFish.cs index 39e4cf941..674c9069c 100644 --- a/Scripts/Items/Aquarium/Fish/SpinedScratcherFish.cs +++ b/Scripts/Items/Aquarium/Fish/SpinedScratcherFish.cs @@ -4,16 +4,16 @@ using Server; namespace Server.Items { public class SpinedScratcherFish : BaseFish - { - public override int LabelNumber{ get{ return 1073832; } } // A Spined Scratcher Fish - + { + public override int LabelNumber => 1073832; // A Spined Scratcher Fish + [Constructible] public SpinedScratcherFish() : base( 0x3B05 ) { } public SpinedScratcherFish( Serial serial ) : base( serial ) - { + { } public override void Serialize( GenericWriter writer ) diff --git a/Scripts/Items/Aquarium/Fish/SpottedBuccaneer.cs b/Scripts/Items/Aquarium/Fish/SpottedBuccaneer.cs index 65c6f1508..9365371c7 100644 --- a/Scripts/Items/Aquarium/Fish/SpottedBuccaneer.cs +++ b/Scripts/Items/Aquarium/Fish/SpottedBuccaneer.cs @@ -4,16 +4,16 @@ using Server; namespace Server.Items { public class SpottedBuccaneer : BaseFish - { - public override int LabelNumber{ get{ return 1073833; } } // A Spotted Buccaneer - + { + public override int LabelNumber => 1073833; // A Spotted Buccaneer + [Constructible] public SpottedBuccaneer() : base( 0x3B09 ) { } public SpottedBuccaneer( Serial serial ) : base( serial ) - { + { } public override void Serialize( GenericWriter writer ) diff --git a/Scripts/Items/Aquarium/Fish/VesperReefTiger.cs b/Scripts/Items/Aquarium/Fish/VesperReefTiger.cs index 6eb6420c2..2727ad75f 100644 --- a/Scripts/Items/Aquarium/Fish/VesperReefTiger.cs +++ b/Scripts/Items/Aquarium/Fish/VesperReefTiger.cs @@ -4,16 +4,16 @@ using Server; namespace Server.Items { public class VesperReefTiger : BaseFish - { - public override int LabelNumber{ get{ return 1073836; } } // A Vesper Reef Tiger - + { + public override int LabelNumber => 1073836; // A Vesper Reef Tiger + [Constructible] public VesperReefTiger() : base( 0x3B08 ) { } public VesperReefTiger( Serial serial ) : base( serial ) - { + { } public override void Serialize( GenericWriter writer ) diff --git a/Scripts/Items/Aquarium/Fish/YellowFinBluebelly.cs b/Scripts/Items/Aquarium/Fish/YellowFinBluebelly.cs index 96bdcf5fc..03efc048a 100644 --- a/Scripts/Items/Aquarium/Fish/YellowFinBluebelly.cs +++ b/Scripts/Items/Aquarium/Fish/YellowFinBluebelly.cs @@ -4,16 +4,16 @@ using Server; namespace Server.Items { public class YellowFinBluebelly : BaseFish - { - public override int LabelNumber{ get{ return 1073831; } } // A Yellow Fin Bluebelly - + { + public override int LabelNumber => 1073831; // A Yellow Fin Bluebelly + [Constructible] public YellowFinBluebelly() : base( 0x3B07 ) { } public YellowFinBluebelly( Serial serial ) : base( serial ) - { + { } public override void Serialize( GenericWriter writer ) diff --git a/Scripts/Items/Aquarium/FishBowl.cs b/Scripts/Items/Aquarium/FishBowl.cs index e3b1ce1b2..53a871483 100644 --- a/Scripts/Items/Aquarium/FishBowl.cs +++ b/Scripts/Items/Aquarium/FishBowl.cs @@ -9,7 +9,7 @@ namespace Server.Items { public class FishBowl : BaseContainer { - public override int LabelNumber{ get{ return 1074499; } } // A fish bowl + public override int LabelNumber => 1074499; // A fish bowl [CommandProperty( AccessLevel.GameMaster )] public bool Empty @@ -32,7 +32,7 @@ namespace Server.Items } } - public override double DefaultWeight { get { return 2.0; } } + public override double DefaultWeight => 2.0; [Constructible] public FishBowl() : base( 0x241C ) diff --git a/Scripts/Items/Aquarium/Reward Fish/BrineShrimp.cs b/Scripts/Items/Aquarium/Reward Fish/BrineShrimp.cs index 77164c725..2bb6910c9 100644 --- a/Scripts/Items/Aquarium/Reward Fish/BrineShrimp.cs +++ b/Scripts/Items/Aquarium/Reward Fish/BrineShrimp.cs @@ -4,16 +4,16 @@ using Server; namespace Server.Items { public class BrineShrimp : BaseFish - { - public override int LabelNumber{ get{ return 1074415; } } // Brine shrimp - + { + public override int LabelNumber => 1074415; // Brine shrimp + [Constructible] public BrineShrimp() : base( 0x3B11 ) { } public BrineShrimp( Serial serial ) : base( serial ) - { + { } public override void Serialize( GenericWriter writer ) diff --git a/Scripts/Items/Aquarium/Reward Fish/Coral.cs b/Scripts/Items/Aquarium/Reward Fish/Coral.cs index cadfcd181..e37172f40 100644 --- a/Scripts/Items/Aquarium/Reward Fish/Coral.cs +++ b/Scripts/Items/Aquarium/Reward Fish/Coral.cs @@ -4,16 +4,16 @@ using Server; namespace Server.Items { public class Coral : BaseFish - { - public override int LabelNumber{ get{ return 1074588; } } // Coral - + { + public override int LabelNumber => 1074588; // Coral + [Constructible] public Coral() : base( Utility.RandomList( 0x3AF9, 0x3AFA, 0x3AFB ) ) { } - + public Coral( Serial serial ) : base( serial ) - { + { } public override void Serialize( GenericWriter writer ) diff --git a/Scripts/Items/Aquarium/Reward Fish/FullMoonFish.cs b/Scripts/Items/Aquarium/Reward Fish/FullMoonFish.cs index 2b943a05b..dd146d637 100644 --- a/Scripts/Items/Aquarium/Reward Fish/FullMoonFish.cs +++ b/Scripts/Items/Aquarium/Reward Fish/FullMoonFish.cs @@ -4,16 +4,16 @@ using Server; namespace Server.Items { public class FullMoonFish : BaseFish - { - public override int LabelNumber{ get{ return 1074597; } } // A Full Moon Fish - + { + public override int LabelNumber => 1074597; // A Full Moon Fish + [Constructible] public FullMoonFish() : base( 0x3B15 ) { - } + } public FullMoonFish( Serial serial ) : base( serial ) - { + { } public override void Serialize( GenericWriter writer ) diff --git a/Scripts/Items/Aquarium/Reward Fish/SeaHorse.cs b/Scripts/Items/Aquarium/Reward Fish/SeaHorse.cs index 34a020333..a565abb91 100644 --- a/Scripts/Items/Aquarium/Reward Fish/SeaHorse.cs +++ b/Scripts/Items/Aquarium/Reward Fish/SeaHorse.cs @@ -4,16 +4,16 @@ using Server; namespace Server.Items { public class SeaHorseFish : BaseFish - { - public override int LabelNumber{ get{ return 1074414; } } // A sea horse - + { + public override int LabelNumber => 1074414; // A sea horse + [Constructible] public SeaHorseFish() : base( 0x3B10 ) { } public SeaHorseFish( Serial serial ) : base( serial ) - { + { } public override void Serialize( GenericWriter writer ) diff --git a/Scripts/Items/Aquarium/Reward Fish/StrippedFlakeFish.cs b/Scripts/Items/Aquarium/Reward Fish/StrippedFlakeFish.cs index 2e872c08b..acc525013 100644 --- a/Scripts/Items/Aquarium/Reward Fish/StrippedFlakeFish.cs +++ b/Scripts/Items/Aquarium/Reward Fish/StrippedFlakeFish.cs @@ -4,16 +4,16 @@ using Server; namespace Server.Items { public class StrippedFlakeFish : BaseFish - { - public override int LabelNumber{ get{ return 1074595; } } // Stripped Flake Fish - + { + public override int LabelNumber => 1074595; // Stripped Flake Fish + [Constructible] public StrippedFlakeFish() : base( 0x3B0A ) { } public StrippedFlakeFish( Serial serial ) : base( serial ) - { + { } public override void Serialize( GenericWriter writer ) diff --git a/Scripts/Items/Aquarium/Reward Fish/StrippedSosarianSwill.cs b/Scripts/Items/Aquarium/Reward Fish/StrippedSosarianSwill.cs index 8017ac5f2..4e870e5a2 100644 --- a/Scripts/Items/Aquarium/Reward Fish/StrippedSosarianSwill.cs +++ b/Scripts/Items/Aquarium/Reward Fish/StrippedSosarianSwill.cs @@ -4,16 +4,16 @@ using Server; namespace Server.Items { public class StrippedSosarianSwill : BaseFish - { - public override int LabelNumber{ get{ return 1074594; } } // Stripped Sosarian Swill - + { + public override int LabelNumber => 1074594; // Stripped Sosarian Swill + [Constructible] public StrippedSosarianSwill() : base( 0x3B0A ) { } public StrippedSosarianSwill( Serial serial ) : base( serial ) - { + { } public override void Serialize( GenericWriter writer ) diff --git a/Scripts/Items/Aquarium/Rewards/AquariumMessage.cs b/Scripts/Items/Aquarium/Rewards/AquariumMessage.cs index c35bcd4e0..6e74a3b8e 100644 --- a/Scripts/Items/Aquarium/Rewards/AquariumMessage.cs +++ b/Scripts/Items/Aquarium/Rewards/AquariumMessage.cs @@ -6,10 +6,10 @@ namespace Server.Items { public class AquariumMessage : MessageInABottle { - public override int LabelNumber{ get{ return 1073894; } } // Message in a Bottle + public override int LabelNumber => 1073894; // Message in a Bottle [Constructible] - public AquariumMessage() : base() + public AquariumMessage() { } diff --git a/Scripts/Items/Aquarium/Rewards/CaptainBlackheartsFishingPole.cs b/Scripts/Items/Aquarium/Rewards/CaptainBlackheartsFishingPole.cs index 45cd3ae6e..7af385381 100644 --- a/Scripts/Items/Aquarium/Rewards/CaptainBlackheartsFishingPole.cs +++ b/Scripts/Items/Aquarium/Rewards/CaptainBlackheartsFishingPole.cs @@ -6,10 +6,10 @@ namespace Server.Items { public class CaptainBlackheartsFishingPole : FishingPole { - public override int LabelNumber{ get{ return 1074571; } } // Captain Blackheart's Fishing Pole + public override int LabelNumber => 1074571; // Captain Blackheart's Fishing Pole [Constructible] - public CaptainBlackheartsFishingPole() : base() + public CaptainBlackheartsFishingPole() { } diff --git a/Scripts/Items/Aquarium/Rewards/CraftysFishingHat.cs b/Scripts/Items/Aquarium/Rewards/CraftysFishingHat.cs index c7957ebc5..bc8bde9d2 100644 --- a/Scripts/Items/Aquarium/Rewards/CraftysFishingHat.cs +++ b/Scripts/Items/Aquarium/Rewards/CraftysFishingHat.cs @@ -6,16 +6,16 @@ namespace Server.Items { public class CraftysFishingHat : BaseHat { - public override int LabelNumber{ get{ return 1074572; } } // Crafty's Fishing Hat + public override int LabelNumber => 1074572; // Crafty's Fishing Hat - public override int BasePhysicalResistance{ get{ return 0; } } - public override int BaseFireResistance{ get{ return 5; } } - public override int BaseColdResistance{ get{ return 9; } } - public override int BasePoisonResistance{ get{ return 5; } } - public override int BaseEnergyResistance{ get{ return 5; } } + public override int BasePhysicalResistance => 0; + public override int BaseFireResistance => 5; + public override int BaseColdResistance => 9; + public override int BasePoisonResistance => 5; + public override int BaseEnergyResistance => 5; - public override int InitMinHits{ get{ return 20; } } - public override int InitMaxHits{ get{ return 30; } } + public override int InitMinHits => 20; + public override int InitMaxHits => 30; [Constructible] public CraftysFishingHat() : base( 0x1713 ) diff --git a/Scripts/Items/Aquarium/Rewards/FishBones.cs b/Scripts/Items/Aquarium/Rewards/FishBones.cs index 4b00b8f35..6791145dc 100644 --- a/Scripts/Items/Aquarium/Rewards/FishBones.cs +++ b/Scripts/Items/Aquarium/Rewards/FishBones.cs @@ -5,8 +5,8 @@ namespace Server.Items { public class FishBones : Item { - public override int LabelNumber{ get{ return 1074601; } } // Fish bones - public override double DefaultWeight{ get{ return 1.0; } } + public override int LabelNumber => 1074601; // Fish bones + public override double DefaultWeight => 1.0; [Constructible] public FishBones() : base( 0x3B0C ) diff --git a/Scripts/Items/Aquarium/Rewards/IslandStatue.cs b/Scripts/Items/Aquarium/Rewards/IslandStatue.cs index 1d2b98b1e..e4298e46a 100644 --- a/Scripts/Items/Aquarium/Rewards/IslandStatue.cs +++ b/Scripts/Items/Aquarium/Rewards/IslandStatue.cs @@ -5,23 +5,23 @@ using Server.Items; namespace Server.Items { public class IslandStatue : Item - { - public override int LabelNumber{ get{ return 1074600; } } // An island statue - public override double DefaultWeight{ get{ return 1.0; } } - + { + public override int LabelNumber => 1074600; // An island statue + public override double DefaultWeight => 1.0; + [Constructible] public IslandStatue() : base( 0x3B0F ) { } public IslandStatue( Serial serial ) : base( serial ) - { + { } - + public override void AddNameProperties( ObjectPropertyList list ) { base.AddNameProperties( list ); - + list.Add( 1073634 ); // An aquarium decoration } diff --git a/Scripts/Items/Aquarium/Rewards/Shell.cs b/Scripts/Items/Aquarium/Rewards/Shell.cs index 887eda0e1..ae3e958fe 100644 --- a/Scripts/Items/Aquarium/Rewards/Shell.cs +++ b/Scripts/Items/Aquarium/Rewards/Shell.cs @@ -6,8 +6,8 @@ namespace Server.Items { public class Shell : Item { - public override int LabelNumber{ get{ return 1074598; } } // A shell - public override double DefaultWeight{ get{ return 1.0; } } + public override int LabelNumber => 1074598; // A shell + public override double DefaultWeight => 1.0; [Constructible] public Shell() : base( Utility.RandomList( 0x3B12, 0x3B13 ) ) diff --git a/Scripts/Items/Aquarium/Rewards/ToyBoat.cs b/Scripts/Items/Aquarium/Rewards/ToyBoat.cs index 5fc3281d7..785a3507d 100644 --- a/Scripts/Items/Aquarium/Rewards/ToyBoat.cs +++ b/Scripts/Items/Aquarium/Rewards/ToyBoat.cs @@ -7,8 +7,8 @@ namespace Server.Items [FlippableAttribute( 0x14F3, 0x14F4 )] public class ToyBoat : Item { - public override int LabelNumber{ get{ return 1074363; } } // A toy boat - public override double DefaultWeight{ get{ return 1.0; } } + public override int LabelNumber => 1074363; // A toy boat + public override double DefaultWeight => 1.0; [Constructible] public ToyBoat() : base( 0x14F4 ) diff --git a/Scripts/Items/Aquarium/Rewards/WaterloggedBoots.cs b/Scripts/Items/Aquarium/Rewards/WaterloggedBoots.cs index b7eecb373..158a7aac6 100644 --- a/Scripts/Items/Aquarium/Rewards/WaterloggedBoots.cs +++ b/Scripts/Items/Aquarium/Rewards/WaterloggedBoots.cs @@ -5,7 +5,7 @@ namespace Server.Items { public class WaterloggedBoots : BaseShoes { - public override int LabelNumber{ get{ return 1074364; } } // Waterlogged boots + public override int LabelNumber => 1074364; // Waterlogged boots [Constructible] public WaterloggedBoots() : base( 0x1711 ) diff --git a/Scripts/Items/Aquarium/VacationWafer.cs b/Scripts/Items/Aquarium/VacationWafer.cs index 4f34c0150..bd49f989b 100644 --- a/Scripts/Items/Aquarium/VacationWafer.cs +++ b/Scripts/Items/Aquarium/VacationWafer.cs @@ -8,7 +8,7 @@ namespace Server.Items { public const int VacationDays = 7; - public override int LabelNumber{ get{ return 1074431; } } // An aquarium flake sphere + public override int LabelNumber => 1074431; // An aquarium flake sphere [Constructible] public VacationWafer() : base( 0x973 ) diff --git a/Scripts/Items/Armor/Artifacts/ArmorOfFortune.cs b/Scripts/Items/Armor/Artifacts/ArmorOfFortune.cs index 2f4529fcd..65f79b75f 100644 --- a/Scripts/Items/Armor/Artifacts/ArmorOfFortune.cs +++ b/Scripts/Items/Armor/Artifacts/ArmorOfFortune.cs @@ -5,11 +5,11 @@ namespace Server.Items { public class ArmorOfFortune : StuddedChest { - public override int LabelNumber{ get{ return 1061098; } } // Armor of Fortune - public override int ArtifactRarity{ get{ return 11; } } + public override int LabelNumber => 1061098; // Armor of Fortune + public override int ArtifactRarity => 11; - public override int InitMinHits{ get{ return 255; } } - public override int InitMaxHits{ get{ return 255; } } + public override int InitMinHits => 255; + public override int InitMaxHits => 255; [Constructible] public ArmorOfFortune() @@ -31,7 +31,7 @@ namespace Server.Items writer.Write( (int) 0 ); } - + public override void Deserialize(GenericReader reader) { base.Deserialize( reader ); @@ -39,4 +39,4 @@ namespace Server.Items int version = reader.ReadInt(); } } -} \ No newline at end of file +} diff --git a/Scripts/Items/Armor/Artifacts/Craftable/BrambleCoat.cs b/Scripts/Items/Armor/Artifacts/Craftable/BrambleCoat.cs index 29c276f7b..c460603d7 100644 --- a/Scripts/Items/Armor/Artifacts/Craftable/BrambleCoat.cs +++ b/Scripts/Items/Armor/Artifacts/Craftable/BrambleCoat.cs @@ -5,13 +5,13 @@ namespace Server.Items { public class BrambleCoat : WoodlandChest { - public override int LabelNumber{ get{ return 1072925; } } // Bramble Coat + public override int LabelNumber => 1072925; // Bramble Coat - public override int BasePhysicalResistance{ get{ return 10; } } - public override int BaseFireResistance{ get{ return 8; } } - public override int BaseColdResistance{ get{ return 7; } } - public override int BasePoisonResistance{ get{ return 8; } } - public override int BaseEnergyResistance{ get{ return 7; } } + public override int BasePhysicalResistance => 10; + public override int BaseFireResistance => 8; + public override int BaseColdResistance => 7; + public override int BasePoisonResistance => 8; + public override int BaseEnergyResistance => 7; [Constructible] public BrambleCoat() @@ -43,4 +43,4 @@ namespace Server.Items int version = reader.ReadEncodedInt(); } } -} \ No newline at end of file +} diff --git a/Scripts/Items/Armor/Artifacts/Craftable/IronwoodCrown.cs b/Scripts/Items/Armor/Artifacts/Craftable/IronwoodCrown.cs index dee25f711..12edd5e10 100644 --- a/Scripts/Items/Armor/Artifacts/Craftable/IronwoodCrown.cs +++ b/Scripts/Items/Armor/Artifacts/Craftable/IronwoodCrown.cs @@ -5,13 +5,13 @@ namespace Server.Items { public class IronwoodCrown : RavenHelm { - public override int LabelNumber{ get{ return 1072924; } } // Ironwood Crown + public override int LabelNumber => 1072924; // Ironwood Crown - public override int BasePhysicalResistance{ get{ return 10; } } - public override int BaseFireResistance{ get{ return 6; } } - public override int BaseColdResistance{ get{ return 7; } } - public override int BasePoisonResistance{ get{ return 7; } } - public override int BaseEnergyResistance{ get{ return 10; } } + public override int BasePhysicalResistance => 10; + public override int BaseFireResistance => 6; + public override int BaseColdResistance => 7; + public override int BasePoisonResistance => 7; + public override int BaseEnergyResistance => 10; [Constructible] public IronwoodCrown() @@ -28,14 +28,14 @@ namespace Server.Items public IronwoodCrown( Serial serial ) : base( serial ) { } - + public override void Serialize( GenericWriter writer ) { base.Serialize( writer ); writer.WriteEncodedInt( 0 ); } - + public override void Deserialize(GenericReader reader) { base.Deserialize( reader ); @@ -43,4 +43,4 @@ namespace Server.Items int version = reader.ReadEncodedInt(); } } -} \ No newline at end of file +} diff --git a/Scripts/Items/Armor/Artifacts/Craftable/SongWovenMantle.cs b/Scripts/Items/Armor/Artifacts/Craftable/SongWovenMantle.cs index 27f95e76e..2dd36e2c9 100644 --- a/Scripts/Items/Armor/Artifacts/Craftable/SongWovenMantle.cs +++ b/Scripts/Items/Armor/Artifacts/Craftable/SongWovenMantle.cs @@ -5,11 +5,11 @@ namespace Server.Items { public class SongWovenMantle : LeafArms { - public override int LabelNumber{ get{ return 1072931; } } // Song Woven Mantle + public override int LabelNumber => 1072931; // Song Woven Mantle - public override int BasePhysicalResistance{ get{ return 14; } } - public override int BaseColdResistance{ get{ return 14; } } - public override int BaseEnergyResistance{ get{ return 16; } } + public override int BasePhysicalResistance => 14; + public override int BaseColdResistance => 14; + public override int BaseEnergyResistance => 16; [Constructible] public SongWovenMantle() @@ -40,4 +40,4 @@ namespace Server.Items int version = reader.ReadEncodedInt(); } } -} \ No newline at end of file +} diff --git a/Scripts/Items/Armor/Artifacts/Craftable/SpellWovenBritches.cs b/Scripts/Items/Armor/Artifacts/Craftable/SpellWovenBritches.cs index aaac1a201..4b6b107c4 100644 --- a/Scripts/Items/Armor/Artifacts/Craftable/SpellWovenBritches.cs +++ b/Scripts/Items/Armor/Artifacts/Craftable/SpellWovenBritches.cs @@ -5,10 +5,10 @@ namespace Server.Items { public class SpellWovenBritches : LeafLegs { - public override int LabelNumber{ get{ return 1072929; } } // Spell Woven Britches + public override int LabelNumber => 1072929; // Spell Woven Britches - public override int BaseFireResistance{ get{ return 15; } } - public override int BasePoisonResistance{ get{ return 16; } } + public override int BaseFireResistance => 15; + public override int BasePoisonResistance => 16; [Constructible] public SpellWovenBritches() @@ -40,4 +40,4 @@ namespace Server.Items int version = reader.ReadEncodedInt(); } } -} \ No newline at end of file +} diff --git a/Scripts/Items/Armor/Artifacts/Craftable/StitchersMittens.cs b/Scripts/Items/Armor/Artifacts/Craftable/StitchersMittens.cs index 594dcfeae..376e71902 100644 --- a/Scripts/Items/Armor/Artifacts/Craftable/StitchersMittens.cs +++ b/Scripts/Items/Armor/Artifacts/Craftable/StitchersMittens.cs @@ -5,10 +5,10 @@ namespace Server.Items { public class StitchersMittens : LeafGloves { - public override int LabelNumber{ get{ return 1072932; } } // Stitcher's Mittens + public override int LabelNumber => 1072932; // Stitcher's Mittens - public override int BasePhysicalResistance{ get{ return 20; } } - public override int BaseColdResistance{ get{ return 20; } } + public override int BasePhysicalResistance => 20; + public override int BaseColdResistance => 20; [Constructible] public StitchersMittens() @@ -40,4 +40,4 @@ namespace Server.Items } } -} \ No newline at end of file +} diff --git a/Scripts/Items/Armor/Artifacts/GauntletsOfNobility.cs b/Scripts/Items/Armor/Artifacts/GauntletsOfNobility.cs index c5024f013..1bde6d7fa 100644 --- a/Scripts/Items/Armor/Artifacts/GauntletsOfNobility.cs +++ b/Scripts/Items/Armor/Artifacts/GauntletsOfNobility.cs @@ -5,14 +5,14 @@ namespace Server.Items { public class GauntletsOfNobility : RingmailGloves { - public override int LabelNumber{ get{ return 1061092; } } // Gauntlets of Nobility - public override int ArtifactRarity{ get{ return 11; } } + public override int LabelNumber => 1061092; // Gauntlets of Nobility + public override int ArtifactRarity => 11; - public override int BasePhysicalResistance{ get{ return 18; } } - public override int BasePoisonResistance{ get{ return 20; } } + public override int BasePhysicalResistance => 18; + public override int BasePoisonResistance => 20; - public override int InitMinHits{ get{ return 255; } } - public override int InitMaxHits{ get{ return 255; } } + public override int InitMinHits => 255; + public override int InitMaxHits => 255; [Constructible] public GauntletsOfNobility() @@ -33,7 +33,7 @@ namespace Server.Items writer.Write( (int) 1 ); } - + public override void Deserialize(GenericReader reader) { base.Deserialize( reader ); @@ -50,4 +50,4 @@ namespace Server.Items } } } -} \ No newline at end of file +} diff --git a/Scripts/Items/Armor/Artifacts/HelmOfInsight.cs b/Scripts/Items/Armor/Artifacts/HelmOfInsight.cs index 045512918..92390f75a 100644 --- a/Scripts/Items/Armor/Artifacts/HelmOfInsight.cs +++ b/Scripts/Items/Armor/Artifacts/HelmOfInsight.cs @@ -5,13 +5,13 @@ namespace Server.Items { public class HelmOfInsight : PlateHelm { - public override int LabelNumber{ get{ return 1061096; } } // Helm of Insight - public override int ArtifactRarity{ get{ return 11; } } + public override int LabelNumber => 1061096; // Helm of Insight + public override int ArtifactRarity => 11; - public override int BaseEnergyResistance{ get{ return 17; } } + public override int BaseEnergyResistance => 17; - public override int InitMinHits{ get{ return 255; } } - public override int InitMaxHits{ get{ return 255; } } + public override int InitMinHits => 255; + public override int InitMaxHits => 255; [Constructible] public HelmOfInsight() @@ -33,7 +33,7 @@ namespace Server.Items writer.Write( (int) 1 ); } - + public override void Deserialize(GenericReader reader) { base.Deserialize( reader ); @@ -44,4 +44,4 @@ namespace Server.Items EnergyBonus = 0; } } -} \ No newline at end of file +} diff --git a/Scripts/Items/Armor/Artifacts/HolyKnightsBreastplate.cs b/Scripts/Items/Armor/Artifacts/HolyKnightsBreastplate.cs index 06a84cbe8..e28059db2 100644 --- a/Scripts/Items/Armor/Artifacts/HolyKnightsBreastplate.cs +++ b/Scripts/Items/Armor/Artifacts/HolyKnightsBreastplate.cs @@ -5,13 +5,13 @@ namespace Server.Items { public class HolyKnightsBreastplate : PlateChest { - public override int LabelNumber{ get{ return 1061097; } } // Holy Knight's Breastplate - public override int ArtifactRarity{ get{ return 11; } } + public override int LabelNumber => 1061097; // Holy Knight's Breastplate + public override int ArtifactRarity => 11; - public override int BasePhysicalResistance{ get{ return 35; } } + public override int BasePhysicalResistance => 35; - public override int InitMinHits{ get{ return 255; } } - public override int InitMaxHits{ get{ return 255; } } + public override int InitMinHits => 255; + public override int InitMaxHits => 255; [Constructible] public HolyKnightsBreastplate() @@ -31,7 +31,7 @@ namespace Server.Items writer.Write( (int) 1 ); } - + public override void Deserialize(GenericReader reader) { base.Deserialize( reader ); @@ -42,4 +42,4 @@ namespace Server.Items PhysicalBonus = 0; } } -} \ No newline at end of file +} diff --git a/Scripts/Items/Armor/Artifacts/InquisitorsResolution.cs b/Scripts/Items/Armor/Artifacts/InquisitorsResolution.cs index 310b60ab0..85c12d371 100644 --- a/Scripts/Items/Armor/Artifacts/InquisitorsResolution.cs +++ b/Scripts/Items/Armor/Artifacts/InquisitorsResolution.cs @@ -5,14 +5,14 @@ namespace Server.Items { public class InquisitorsResolution : PlateGloves { - public override int LabelNumber{ get{ return 1060206; } } // The Inquisitor's Resolution - public override int ArtifactRarity{ get{ return 10; } } + public override int LabelNumber => 1060206; // The Inquisitor's Resolution + public override int ArtifactRarity => 10; - public override int BaseColdResistance{ get{ return 22; } } - public override int BaseEnergyResistance{ get{ return 17; } } + public override int BaseColdResistance => 22; + public override int BaseEnergyResistance => 17; - public override int InitMinHits{ get{ return 255; } } - public override int InitMaxHits{ get{ return 255; } } + public override int InitMinHits => 255; + public override int InitMaxHits => 255; [Constructible] public InquisitorsResolution() @@ -33,7 +33,7 @@ namespace Server.Items writer.Write( (int) 1 ); } - + public override void Deserialize(GenericReader reader) { base.Deserialize( reader ); @@ -47,4 +47,4 @@ namespace Server.Items } } } -} \ No newline at end of file +} diff --git a/Scripts/Items/Armor/Artifacts/JackalsCollar.cs b/Scripts/Items/Armor/Artifacts/JackalsCollar.cs index 7e9d4ec14..1e37287bc 100644 --- a/Scripts/Items/Armor/Artifacts/JackalsCollar.cs +++ b/Scripts/Items/Armor/Artifacts/JackalsCollar.cs @@ -5,14 +5,14 @@ namespace Server.Items { public class JackalsCollar : PlateGorget { - public override int LabelNumber{ get{ return 1061594; } } // Jackal's Collar - public override int ArtifactRarity{ get{ return 11; } } + public override int LabelNumber => 1061594; // Jackal's Collar + public override int ArtifactRarity => 11; - public override int BaseFireResistance{ get{ return 23; } } - public override int BaseColdResistance{ get{ return 17; } } + public override int BaseFireResistance => 23; + public override int BaseColdResistance => 17; - public override int InitMinHits{ get{ return 255; } } - public override int InitMaxHits{ get{ return 255; } } + public override int InitMinHits => 255; + public override int InitMaxHits => 255; [Constructible] public JackalsCollar() @@ -32,7 +32,7 @@ namespace Server.Items writer.Write( (int) 1 ); } - + public override void Deserialize(GenericReader reader) { base.Deserialize( reader ); @@ -49,4 +49,4 @@ namespace Server.Items } } } -} \ No newline at end of file +} diff --git a/Scripts/Items/Armor/Artifacts/LeggingsOfBane.cs b/Scripts/Items/Armor/Artifacts/LeggingsOfBane.cs index 59a456d08..0f4c9a82f 100644 --- a/Scripts/Items/Armor/Artifacts/LeggingsOfBane.cs +++ b/Scripts/Items/Armor/Artifacts/LeggingsOfBane.cs @@ -5,13 +5,13 @@ namespace Server.Items { public class LeggingsOfBane : ChainLegs { - public override int LabelNumber{ get{ return 1061100; } } // Leggings of Bane - public override int ArtifactRarity{ get{ return 11; } } + public override int LabelNumber => 1061100; // Leggings of Bane + public override int ArtifactRarity => 11; - public override int BasePoisonResistance{ get{ return 36; } } + public override int BasePoisonResistance => 36; - public override int InitMinHits{ get{ return 255; } } - public override int InitMaxHits{ get{ return 255; } } + public override int InitMinHits => 255; + public override int InitMaxHits => 255; [Constructible] public LeggingsOfBane() @@ -33,7 +33,7 @@ namespace Server.Items writer.Write( (int) 2 ); } - + public override void Deserialize(GenericReader reader) { base.Deserialize( reader ); @@ -58,4 +58,4 @@ namespace Server.Items } } } -} \ No newline at end of file +} diff --git a/Scripts/Items/Armor/Artifacts/MidnightBracers.cs b/Scripts/Items/Armor/Artifacts/MidnightBracers.cs index 5c0bda166..53335696e 100644 --- a/Scripts/Items/Armor/Artifacts/MidnightBracers.cs +++ b/Scripts/Items/Armor/Artifacts/MidnightBracers.cs @@ -5,13 +5,13 @@ namespace Server.Items { public class MidnightBracers : BoneArms { - public override int LabelNumber{ get{ return 1061093; } } // Midnight Bracers - public override int ArtifactRarity{ get{ return 11; } } + public override int LabelNumber => 1061093; // Midnight Bracers + public override int ArtifactRarity => 11; - public override int BasePhysicalResistance{ get{ return 23; } } + public override int BasePhysicalResistance => 23; - public override int InitMinHits{ get{ return 255; } } - public override int InitMaxHits{ get{ return 255; } } + public override int InitMinHits => 255; + public override int InitMaxHits => 255; [Constructible] public MidnightBracers() @@ -32,7 +32,7 @@ namespace Server.Items writer.Write( (int) 1 ); } - + public override void Deserialize(GenericReader reader) { base.Deserialize( reader ); @@ -43,4 +43,4 @@ namespace Server.Items PhysicalBonus = 0; } } -} \ No newline at end of file +} diff --git a/Scripts/Items/Armor/Artifacts/OrnateCrownOfTheHarrower.cs b/Scripts/Items/Armor/Artifacts/OrnateCrownOfTheHarrower.cs index 746dc7b1b..8f3385336 100644 --- a/Scripts/Items/Armor/Artifacts/OrnateCrownOfTheHarrower.cs +++ b/Scripts/Items/Armor/Artifacts/OrnateCrownOfTheHarrower.cs @@ -5,13 +5,13 @@ namespace Server.Items { public class OrnateCrownOfTheHarrower : BoneHelm { - public override int LabelNumber{ get{ return 1061095; } } // Ornate Crown of the Harrower - public override int ArtifactRarity{ get{ return 11; } } + public override int LabelNumber => 1061095; // Ornate Crown of the Harrower + public override int ArtifactRarity => 11; - public override int BasePoisonResistance{ get{ return 17; } } + public override int BasePoisonResistance => 17; - public override int InitMinHits{ get{ return 255; } } - public override int InitMaxHits{ get{ return 255; } } + public override int InitMinHits => 255; + public override int InitMaxHits => 255; [Constructible] public OrnateCrownOfTheHarrower() @@ -32,7 +32,7 @@ namespace Server.Items writer.Write( (int) 1 ); } - + public override void Deserialize(GenericReader reader) { base.Deserialize( reader ); @@ -48,4 +48,4 @@ namespace Server.Items } } } -} \ No newline at end of file +} diff --git a/Scripts/Items/Armor/Artifacts/ShadowDancerLeggings.cs b/Scripts/Items/Armor/Artifacts/ShadowDancerLeggings.cs index 9b85335de..07f7a7bde 100644 --- a/Scripts/Items/Armor/Artifacts/ShadowDancerLeggings.cs +++ b/Scripts/Items/Armor/Artifacts/ShadowDancerLeggings.cs @@ -5,15 +5,15 @@ namespace Server.Items { public class ShadowDancerLeggings : LeatherLegs { - public override int LabelNumber{ get{ return 1061598; } } // Shadow Dancer Leggings - public override int ArtifactRarity{ get{ return 11; } } + public override int LabelNumber => 1061598; // Shadow Dancer Leggings + public override int ArtifactRarity => 11; - public override int BasePhysicalResistance{ get{ return 17; } } - public override int BasePoisonResistance{ get{ return 18; } } - public override int BaseEnergyResistance{ get{ return 18; } } + public override int BasePhysicalResistance => 17; + public override int BasePoisonResistance => 18; + public override int BaseEnergyResistance => 18; - public override int InitMinHits{ get{ return 255; } } - public override int InitMaxHits{ get{ return 255; } } + public override int InitMinHits => 255; + public override int InitMaxHits => 255; [Constructible] public ShadowDancerLeggings() @@ -34,7 +34,7 @@ namespace Server.Items writer.Write( (int) 1 ); } - + public override void Deserialize(GenericReader reader) { base.Deserialize( reader ); @@ -52,4 +52,4 @@ namespace Server.Items } } } -} \ No newline at end of file +} diff --git a/Scripts/Items/Armor/Artifacts/TunicOfFire.cs b/Scripts/Items/Armor/Artifacts/TunicOfFire.cs index 81450aa58..2b4d6f776 100644 --- a/Scripts/Items/Armor/Artifacts/TunicOfFire.cs +++ b/Scripts/Items/Armor/Artifacts/TunicOfFire.cs @@ -5,14 +5,14 @@ namespace Server.Items { public class TunicOfFire : ChainChest { - public override int LabelNumber{ get{ return 1061099; } } // Tunic of Fire - public override int ArtifactRarity{ get{ return 11; } } + public override int LabelNumber => 1061099; // Tunic of Fire + public override int ArtifactRarity => 11; - public override int BasePhysicalResistance{ get{ return 24; } } - public override int BaseFireResistance{ get{ return 34; } } + public override int BasePhysicalResistance => 24; + public override int BaseFireResistance => 34; - public override int InitMinHits{ get{ return 255; } } - public override int InitMaxHits{ get{ return 255; } } + public override int InitMinHits => 255; + public override int InitMaxHits => 255; [Constructible] public TunicOfFire() @@ -33,7 +33,7 @@ namespace Server.Items writer.Write( (int) 1 ); } - + public override void Deserialize(GenericReader reader) { base.Deserialize( reader ); @@ -53,4 +53,4 @@ namespace Server.Items } } } -} \ No newline at end of file +} diff --git a/Scripts/Items/Armor/Artifacts/VoiceOfTheFallenKing.cs b/Scripts/Items/Armor/Artifacts/VoiceOfTheFallenKing.cs index 6902b9a1a..52aa6cee3 100644 --- a/Scripts/Items/Armor/Artifacts/VoiceOfTheFallenKing.cs +++ b/Scripts/Items/Armor/Artifacts/VoiceOfTheFallenKing.cs @@ -5,14 +5,14 @@ namespace Server.Items { public class VoiceOfTheFallenKing : LeatherGorget { - public override int LabelNumber{ get{ return 1061094; } } // Voice of the Fallen King - public override int ArtifactRarity{ get{ return 11; } } + public override int LabelNumber => 1061094; // Voice of the Fallen King + public override int ArtifactRarity => 11; - public override int BaseColdResistance{ get{ return 18; } } - public override int BaseEnergyResistance{ get{ return 18; } } + public override int BaseColdResistance => 18; + public override int BaseEnergyResistance => 18; - public override int InitMinHits{ get{ return 255; } } - public override int InitMaxHits{ get{ return 255; } } + public override int InitMinHits => 255; + public override int InitMaxHits => 255; [Constructible] public VoiceOfTheFallenKing() @@ -33,7 +33,7 @@ namespace Server.Items writer.Write( (int) 1 ); } - + public override void Deserialize(GenericReader reader) { base.Deserialize( reader ); @@ -50,4 +50,4 @@ namespace Server.Items } } } -} \ No newline at end of file +} diff --git a/Scripts/Items/Armor/BaseArmor.cs b/Scripts/Items/Armor/BaseArmor.cs index 4b3211131..2b6580105 100644 --- a/Scripts/Items/Armor/BaseArmor.cs +++ b/Scripts/Items/Armor/BaseArmor.cs @@ -33,7 +33,7 @@ namespace Server.Items /* Armor internals work differently now (Jun 19 2003) - * + * * The attributes defined below default to -1. * If the value is -1, the corresponding virtual 'Aos/Old' property is used. * If not, the attribute value itself is used. Here's the list: @@ -129,8 +129,8 @@ namespace Server.Items return m_ArmorBase; } set - { - m_ArmorBase = value; Invalidate(); + { + m_ArmorBase = value; Invalidate(); } } @@ -289,11 +289,11 @@ namespace Server.Items [CommandProperty( AccessLevel.GameMaster )] public int HitPoints { - get + get { return m_HitPoints; } - set + set { if ( value != m_HitPoints && MaxHitPoints > 0 ) { @@ -317,7 +317,7 @@ namespace Server.Items set{ m_Crafter = value; InvalidateProperties(); } } - + [CommandProperty( AccessLevel.GameMaster )] public ArmorQuality Quality { @@ -425,11 +425,11 @@ namespace Server.Items public virtual int BasePoisonResistance{ get{ return 0; } } public virtual int BaseEnergyResistance{ get{ return 0; } } - public override int PhysicalResistance{ get{ return BasePhysicalResistance + GetProtOffset() + GetResourceAttrs().ArmorPhysicalResist + m_PhysicalBonus; } } - public override int FireResistance{ get{ return BaseFireResistance + GetProtOffset() + GetResourceAttrs().ArmorFireResist + m_FireBonus; } } - public override int ColdResistance{ get{ return BaseColdResistance + GetProtOffset() + GetResourceAttrs().ArmorColdResist + m_ColdBonus; } } - public override int PoisonResistance{ get{ return BasePoisonResistance + GetProtOffset() + GetResourceAttrs().ArmorPoisonResist + m_PoisonBonus; } } - public override int EnergyResistance{ get{ return BaseEnergyResistance + GetProtOffset() + GetResourceAttrs().ArmorEnergyResist + m_EnergyBonus; } } + public override int PhysicalResistance => BasePhysicalResistance + GetProtOffset() + GetResourceAttrs().ArmorPhysicalResist + m_PhysicalBonus; + public override int FireResistance => BaseFireResistance + GetProtOffset() + GetResourceAttrs().ArmorFireResist + m_FireBonus; + public override int ColdResistance => BaseColdResistance + GetProtOffset() + GetResourceAttrs().ArmorColdResist + m_ColdBonus; + public override int PoisonResistance => BasePoisonResistance + GetProtOffset() + GetResourceAttrs().ArmorPoisonResist + m_PoisonBonus; + public override int EnergyResistance => BaseEnergyResistance + GetProtOffset() + GetResourceAttrs().ArmorEnergyResist + m_EnergyBonus; public virtual int InitMinHits{ get{ return 0; } } public virtual int InitMaxHits{ get{ return 0; } } @@ -1163,7 +1163,7 @@ namespace Server.Items return base.AllowSecureTrade( from, to, newOwner, accepted ); } - public virtual Race RequiredRace { get { return null; } } + public virtual Race RequiredRace => null; public override bool CanEquip( Mobile from ) { @@ -1292,7 +1292,7 @@ namespace Server.Items int Absorbed = (int)(HalfAr + HalfAr*Utility.RandomDouble()); damageTaken -= Absorbed; - if ( damageTaken < 0 ) + if ( damageTaken < 0 ) damageTaken = 0; if ( Absorbed < 2 ) diff --git a/Scripts/Items/Armor/Bone/BoneArms.cs b/Scripts/Items/Armor/Bone/BoneArms.cs index d01935aa8..4f8ed58b7 100644 --- a/Scripts/Items/Armor/Bone/BoneArms.cs +++ b/Scripts/Items/Armor/Bone/BoneArms.cs @@ -6,25 +6,25 @@ namespace Server.Items [FlippableAttribute( 0x144e, 0x1453 )] public class BoneArms : BaseArmor { - public override int BasePhysicalResistance{ get{ return 3; } } - public override int BaseFireResistance{ get{ return 3; } } - public override int BaseColdResistance{ get{ return 4; } } - public override int BasePoisonResistance{ get{ return 2; } } - public override int BaseEnergyResistance{ get{ return 4; } } + public override int BasePhysicalResistance => 3; + public override int BaseFireResistance => 3; + public override int BaseColdResistance => 4; + public override int BasePoisonResistance => 2; + public override int BaseEnergyResistance => 4; - public override int InitMinHits{ get{ return 25; } } - public override int InitMaxHits{ get{ return 30; } } + public override int InitMinHits => 25; + public override int InitMaxHits => 30; - public override int AosStrReq{ get{ return 55; } } - public override int OldStrReq{ get{ return 40; } } + public override int AosStrReq => 55; + public override int OldStrReq => 40; - public override int OldDexBonus{ get{ return -2; } } + public override int OldDexBonus => -2; - public override int ArmorBase{ get{ return 30; } } - public override int RevertArmorBase{ get{ return 4; } } + public override int ArmorBase => 30; + public override int RevertArmorBase => 4; - public override ArmorMaterialType MaterialType{ get{ return ArmorMaterialType.Bone; } } - public override CraftResource DefaultResource{ get{ return CraftResource.RegularLeather; } } + public override ArmorMaterialType MaterialType => ArmorMaterialType.Bone; + public override CraftResource DefaultResource => CraftResource.RegularLeather; [Constructible] public BoneArms() : base( 0x144E ) @@ -35,7 +35,7 @@ namespace Server.Items public BoneArms( Serial serial ) : base( serial ) { } - + public override void Serialize( GenericWriter writer ) { base.Serialize( writer ); @@ -44,11 +44,11 @@ namespace Server.Items if ( Weight == 1.0 ) Weight = 2.0; } - + public override void Deserialize(GenericReader reader) { base.Deserialize( reader ); int version = reader.ReadInt(); } } -} \ No newline at end of file +} diff --git a/Scripts/Items/Armor/Bone/BoneChest.cs b/Scripts/Items/Armor/Bone/BoneChest.cs index 66acea23b..a248f4079 100644 --- a/Scripts/Items/Armor/Bone/BoneChest.cs +++ b/Scripts/Items/Armor/Bone/BoneChest.cs @@ -6,25 +6,25 @@ namespace Server.Items [FlippableAttribute( 0x144f, 0x1454 )] public class BoneChest : BaseArmor { - public override int BasePhysicalResistance{ get{ return 3; } } - public override int BaseFireResistance{ get{ return 3; } } - public override int BaseColdResistance{ get{ return 4; } } - public override int BasePoisonResistance{ get{ return 2; } } - public override int BaseEnergyResistance{ get{ return 4; } } + public override int BasePhysicalResistance => 3; + public override int BaseFireResistance => 3; + public override int BaseColdResistance => 4; + public override int BasePoisonResistance => 2; + public override int BaseEnergyResistance => 4; - public override int InitMinHits{ get{ return 25; } } - public override int InitMaxHits{ get{ return 30; } } + public override int InitMinHits => 25; + public override int InitMaxHits => 30; - public override int AosStrReq{ get{ return 60; } } - public override int OldStrReq{ get{ return 40; } } + public override int AosStrReq => 60; + public override int OldStrReq => 40; - public override int OldDexBonus{ get{ return -6; } } + public override int OldDexBonus => -6; - public override int ArmorBase{ get{ return 30; } } - public override int RevertArmorBase{ get{ return 11; } } + public override int ArmorBase => 30; + public override int RevertArmorBase => 11; - public override ArmorMaterialType MaterialType{ get{ return ArmorMaterialType.Bone; } } - public override CraftResource DefaultResource{ get{ return CraftResource.RegularLeather; } } + public override ArmorMaterialType MaterialType => ArmorMaterialType.Bone; + public override CraftResource DefaultResource => CraftResource.RegularLeather; [Constructible] public BoneChest() : base( 0x144F ) @@ -35,7 +35,7 @@ namespace Server.Items public BoneChest( Serial serial ) : base( serial ) { } - + public override void Serialize( GenericWriter writer ) { base.Serialize( writer ); @@ -44,11 +44,11 @@ namespace Server.Items if ( Weight == 1.0 ) Weight = 6.0; } - + public override void Deserialize(GenericReader reader) { base.Deserialize( reader ); int version = reader.ReadInt(); } } -} \ No newline at end of file +} diff --git a/Scripts/Items/Armor/Bone/BoneGloves.cs b/Scripts/Items/Armor/Bone/BoneGloves.cs index 4c835597d..7f75e7a42 100644 --- a/Scripts/Items/Armor/Bone/BoneGloves.cs +++ b/Scripts/Items/Armor/Bone/BoneGloves.cs @@ -6,25 +6,25 @@ namespace Server.Items [FlippableAttribute( 0x1450, 0x1455 )] public class BoneGloves : BaseArmor { - public override int BasePhysicalResistance{ get{ return 3; } } - public override int BaseFireResistance{ get{ return 3; } } - public override int BaseColdResistance{ get{ return 4; } } - public override int BasePoisonResistance{ get{ return 2; } } - public override int BaseEnergyResistance{ get{ return 4; } } + public override int BasePhysicalResistance => 3; + public override int BaseFireResistance => 3; + public override int BaseColdResistance => 4; + public override int BasePoisonResistance => 2; + public override int BaseEnergyResistance => 4; - public override int InitMinHits{ get{ return 25; } } - public override int InitMaxHits{ get{ return 30; } } + public override int InitMinHits => 25; + public override int InitMaxHits => 30; - public override int AosStrReq{ get{ return 55; } } - public override int OldStrReq{ get{ return 40; } } + public override int AosStrReq => 55; + public override int OldStrReq => 40; - public override int OldDexBonus{ get{ return -1; } } + public override int OldDexBonus => -1; - public override int ArmorBase{ get{ return 30; } } - public override int RevertArmorBase{ get{ return 2; } } + public override int ArmorBase => 30; + public override int RevertArmorBase => 2; - public override ArmorMaterialType MaterialType{ get{ return ArmorMaterialType.Bone; } } - public override CraftResource DefaultResource{ get{ return CraftResource.RegularLeather; } } + public override ArmorMaterialType MaterialType => ArmorMaterialType.Bone; + public override CraftResource DefaultResource => CraftResource.RegularLeather; [Constructible] public BoneGloves() : base( 0x1450 ) @@ -35,7 +35,7 @@ namespace Server.Items public BoneGloves( Serial serial ) : base( serial ) { } - + public override void Serialize( GenericWriter writer ) { base.Serialize( writer ); @@ -44,11 +44,11 @@ namespace Server.Items if ( Weight == 1.0 ) Weight = 2.0; } - + public override void Deserialize(GenericReader reader) { base.Deserialize( reader ); int version = reader.ReadInt(); } } -} \ No newline at end of file +} diff --git a/Scripts/Items/Armor/Bone/BoneLegs.cs b/Scripts/Items/Armor/Bone/BoneLegs.cs index 52c1d5f05..cfb2f5312 100644 --- a/Scripts/Items/Armor/Bone/BoneLegs.cs +++ b/Scripts/Items/Armor/Bone/BoneLegs.cs @@ -6,25 +6,25 @@ namespace Server.Items [FlippableAttribute( 0x1452, 0x1457 )] public class BoneLegs : BaseArmor { - public override int BasePhysicalResistance{ get{ return 3; } } - public override int BaseFireResistance{ get{ return 3; } } - public override int BaseColdResistance{ get{ return 4; } } - public override int BasePoisonResistance{ get{ return 2; } } - public override int BaseEnergyResistance{ get{ return 4; } } + public override int BasePhysicalResistance => 3; + public override int BaseFireResistance => 3; + public override int BaseColdResistance => 4; + public override int BasePoisonResistance => 2; + public override int BaseEnergyResistance => 4; - public override int InitMinHits{ get{ return 25; } } - public override int InitMaxHits{ get{ return 30; } } + public override int InitMinHits => 25; + public override int InitMaxHits => 30; - public override int AosStrReq{ get{ return 55; } } - public override int OldStrReq{ get{ return 40; } } + public override int AosStrReq => 55; + public override int OldStrReq => 40; - public override int OldDexBonus{ get{ return -4; } } + public override int OldDexBonus => -4; - public override int ArmorBase{ get{ return 30; } } - public override int RevertArmorBase{ get{ return 7; } } + public override int ArmorBase => 30; + public override int RevertArmorBase => 7; - public override ArmorMaterialType MaterialType{ get{ return ArmorMaterialType.Bone; } } - public override CraftResource DefaultResource{ get{ return CraftResource.RegularLeather; } } + public override ArmorMaterialType MaterialType => ArmorMaterialType.Bone; + public override CraftResource DefaultResource => CraftResource.RegularLeather; [Constructible] public BoneLegs() : base( 0x1452 ) @@ -35,17 +35,17 @@ namespace Server.Items public BoneLegs( Serial serial ) : base( serial ) { } - + public override void Serialize( GenericWriter writer ) { base.Serialize( writer ); writer.Write( (int) 0 ); } - + public override void Deserialize(GenericReader reader) { base.Deserialize( reader ); int version = reader.ReadInt(); } } -} \ No newline at end of file +} diff --git a/Scripts/Items/Armor/Chain/ChainChest.cs b/Scripts/Items/Armor/Chain/ChainChest.cs index d2c4765e8..c5202d2e4 100644 --- a/Scripts/Items/Armor/Chain/ChainChest.cs +++ b/Scripts/Items/Armor/Chain/ChainChest.cs @@ -6,23 +6,23 @@ namespace Server.Items [FlippableAttribute( 0x13bf, 0x13c4 )] public class ChainChest : BaseArmor { - public override int BasePhysicalResistance{ get{ return 4; } } - public override int BaseFireResistance{ get{ return 4; } } - public override int BaseColdResistance{ get{ return 4; } } - public override int BasePoisonResistance{ get{ return 1; } } - public override int BaseEnergyResistance{ get{ return 2; } } + public override int BasePhysicalResistance => 4; + public override int BaseFireResistance => 4; + public override int BaseColdResistance => 4; + public override int BasePoisonResistance => 1; + public override int BaseEnergyResistance => 2; - public override int InitMinHits{ get{ return 45; } } - public override int InitMaxHits{ get{ return 60; } } + public override int InitMinHits => 45; + public override int InitMaxHits => 60; - public override int AosStrReq{ get{ return 60; } } - public override int OldStrReq{ get{ return 20; } } + public override int AosStrReq => 60; + public override int OldStrReq => 20; - public override int OldDexBonus{ get{ return -5; } } + public override int OldDexBonus => -5; - public override int ArmorBase{ get{ return 28; } } + public override int ArmorBase => 28; - public override ArmorMaterialType MaterialType{ get{ return ArmorMaterialType.Chainmail; } } + public override ArmorMaterialType MaterialType => ArmorMaterialType.Chainmail; [Constructible] public ChainChest() : base( 0x13BF ) @@ -33,17 +33,17 @@ namespace Server.Items public ChainChest( Serial serial ) : base( serial ) { } - + public override void Serialize( GenericWriter writer ) { base.Serialize( writer ); writer.Write( (int) 0 ); } - + public override void Deserialize(GenericReader reader) { base.Deserialize( reader ); int version = reader.ReadInt(); } } -} \ No newline at end of file +} diff --git a/Scripts/Items/Armor/Chain/ChainHatsuburi.cs b/Scripts/Items/Armor/Chain/ChainHatsuburi.cs index d7bafda49..0a613015d 100644 --- a/Scripts/Items/Armor/Chain/ChainHatsuburi.cs +++ b/Scripts/Items/Armor/Chain/ChainHatsuburi.cs @@ -5,21 +5,21 @@ namespace Server.Items { public class ChainHatsuburi : BaseArmor { - public override int BasePhysicalResistance{ get{ return 5; } } - public override int BaseFireResistance{ get{ return 2; } } - public override int BaseColdResistance{ get{ return 2; } } - public override int BasePoisonResistance{ get{ return 2; } } - public override int BaseEnergyResistance{ get{ return 4; } } + public override int BasePhysicalResistance => 5; + public override int BaseFireResistance => 2; + public override int BaseColdResistance => 2; + public override int BasePoisonResistance => 2; + public override int BaseEnergyResistance => 4; - public override int InitMinHits{ get{ return 55; } } - public override int InitMaxHits{ get{ return 75; } } + public override int InitMinHits => 55; + public override int InitMaxHits => 75; - public override int AosStrReq{ get{ return 50; } } - public override int OldStrReq{ get{ return 50; } } + public override int AosStrReq => 50; + public override int OldStrReq => 50; - public override int ArmorBase{ get{ return 3; } } + public override int ArmorBase => 3; - public override ArmorMaterialType MaterialType{ get{ return ArmorMaterialType.Chainmail; } } + public override ArmorMaterialType MaterialType => ArmorMaterialType.Chainmail; [Constructible] public ChainHatsuburi() : base( 0x2774 ) @@ -30,17 +30,17 @@ namespace Server.Items public ChainHatsuburi( Serial serial ) : base( serial ) { } - + public override void Serialize( GenericWriter writer ) { base.Serialize( writer ); writer.Write( (int) 0 ); } - + public override void Deserialize( GenericReader reader ) { base.Deserialize( reader ); int version = reader.ReadInt(); } } -} \ No newline at end of file +} diff --git a/Scripts/Items/Armor/Chain/ChainLegs.cs b/Scripts/Items/Armor/Chain/ChainLegs.cs index 23251048d..0010a238e 100644 --- a/Scripts/Items/Armor/Chain/ChainLegs.cs +++ b/Scripts/Items/Armor/Chain/ChainLegs.cs @@ -6,23 +6,23 @@ namespace Server.Items [FlippableAttribute( 0x13be, 0x13c3 )] public class ChainLegs : BaseArmor { - public override int BasePhysicalResistance{ get{ return 4; } } - public override int BaseFireResistance{ get{ return 4; } } - public override int BaseColdResistance{ get{ return 4; } } - public override int BasePoisonResistance{ get{ return 1; } } - public override int BaseEnergyResistance{ get{ return 2; } } + public override int BasePhysicalResistance => 4; + public override int BaseFireResistance => 4; + public override int BaseColdResistance => 4; + public override int BasePoisonResistance => 1; + public override int BaseEnergyResistance => 2; - public override int InitMinHits{ get{ return 45; } } - public override int InitMaxHits{ get{ return 60; } } + public override int InitMinHits => 45; + public override int InitMaxHits => 60; - public override int AosStrReq{ get{ return 60; } } - public override int OldStrReq{ get{ return 20; } } + public override int AosStrReq => 60; + public override int OldStrReq => 20; - public override int OldDexBonus{ get{ return -3; } } + public override int OldDexBonus => -3; - public override int ArmorBase{ get{ return 28; } } + public override int ArmorBase => 28; - public override ArmorMaterialType MaterialType{ get{ return ArmorMaterialType.Chainmail; } } + public override ArmorMaterialType MaterialType => ArmorMaterialType.Chainmail; [Constructible] public ChainLegs() : base( 0x13BE ) @@ -33,17 +33,17 @@ namespace Server.Items public ChainLegs( Serial serial ) : base( serial ) { } - + public override void Serialize( GenericWriter writer ) { base.Serialize( writer ); writer.Write( (int) 0 ); } - + public override void Deserialize(GenericReader reader) { base.Deserialize( reader ); int version = reader.ReadInt(); } } -} \ No newline at end of file +} diff --git a/Scripts/Items/Armor/DaemonBone/DaemonArms.cs b/Scripts/Items/Armor/DaemonBone/DaemonArms.cs index 5b3f0ded9..e3faf190a 100644 --- a/Scripts/Items/Armor/DaemonBone/DaemonArms.cs +++ b/Scripts/Items/Armor/DaemonBone/DaemonArms.cs @@ -6,26 +6,26 @@ namespace Server.Items [FlippableAttribute( 0x144e, 0x1453 )] public class DaemonArms : BaseArmor { - public override int BasePhysicalResistance{ get{ return 6; } } - public override int BaseFireResistance{ get{ return 6; } } - public override int BaseColdResistance{ get{ return 7; } } - public override int BasePoisonResistance{ get{ return 5; } } - public override int BaseEnergyResistance{ get{ return 7; } } + public override int BasePhysicalResistance => 6; + public override int BaseFireResistance => 6; + public override int BaseColdResistance => 7; + public override int BasePoisonResistance => 5; + public override int BaseEnergyResistance => 7; - public override int InitMinHits{ get{ return 255; } } - public override int InitMaxHits{ get{ return 255; } } + public override int InitMinHits => 255; + public override int InitMaxHits => 255; - public override int AosStrReq{ get{ return 55; } } - public override int OldStrReq{ get{ return 40; } } + public override int AosStrReq => 55; + public override int OldStrReq => 40; - public override int OldDexBonus{ get{ return -2; } } + public override int OldDexBonus => -2; - public override int ArmorBase{ get{ return 46; } } + public override int ArmorBase => 46; - public override ArmorMaterialType MaterialType{ get{ return ArmorMaterialType.Bone; } } - public override CraftResource DefaultResource{ get{ return CraftResource.RegularLeather; } } + public override ArmorMaterialType MaterialType => ArmorMaterialType.Bone; + public override CraftResource DefaultResource => CraftResource.RegularLeather; - public override int LabelNumber{ get{ return 1041371; } } // daemon bone arms + public override int LabelNumber => 1041371; // daemon bone arms [Constructible] public DaemonArms() : base( 0x144E ) @@ -39,7 +39,7 @@ namespace Server.Items public DaemonArms( Serial serial ) : base( serial ) { } - + public override void Serialize( GenericWriter writer ) { base.Serialize( writer ); @@ -49,7 +49,7 @@ namespace Server.Items if ( Weight == 1.0 ) Weight = 2.0; } - + public override void Deserialize(GenericReader reader) { base.Deserialize( reader ); @@ -60,4 +60,4 @@ namespace Server.Items ArmorAttributes.SelfRepair = 1; } } -} \ No newline at end of file +} diff --git a/Scripts/Items/Armor/DaemonBone/DaemonChest.cs b/Scripts/Items/Armor/DaemonBone/DaemonChest.cs index 971a17f76..a4babd74a 100644 --- a/Scripts/Items/Armor/DaemonBone/DaemonChest.cs +++ b/Scripts/Items/Armor/DaemonBone/DaemonChest.cs @@ -6,26 +6,26 @@ namespace Server.Items [FlippableAttribute( 0x144f, 0x1454 )] public class DaemonChest : BaseArmor { - public override int BasePhysicalResistance{ get{ return 6; } } - public override int BaseFireResistance{ get{ return 6; } } - public override int BaseColdResistance{ get{ return 7; } } - public override int BasePoisonResistance{ get{ return 5; } } - public override int BaseEnergyResistance{ get{ return 7; } } + public override int BasePhysicalResistance => 6; + public override int BaseFireResistance => 6; + public override int BaseColdResistance => 7; + public override int BasePoisonResistance => 5; + public override int BaseEnergyResistance => 7; - public override int InitMinHits{ get{ return 255; } } - public override int InitMaxHits{ get{ return 255; } } + public override int InitMinHits => 255; + public override int InitMaxHits => 255; - public override int AosStrReq{ get{ return 60; } } - public override int OldStrReq{ get{ return 40; } } + public override int AosStrReq => 60; + public override int OldStrReq => 40; - public override int OldDexBonus{ get{ return -6; } } + public override int OldDexBonus => -6; - public override int ArmorBase{ get{ return 46; } } + public override int ArmorBase => 46; - public override ArmorMaterialType MaterialType{ get{ return ArmorMaterialType.Bone; } } - public override CraftResource DefaultResource{ get{ return CraftResource.RegularLeather; } } + public override ArmorMaterialType MaterialType => ArmorMaterialType.Bone; + public override CraftResource DefaultResource => CraftResource.RegularLeather; - public override int LabelNumber{ get{ return 1041372; } } // daemon bone armor + public override int LabelNumber => 1041372; // daemon bone armor [Constructible] public DaemonChest() : base( 0x144F ) @@ -39,14 +39,14 @@ namespace Server.Items public DaemonChest( Serial serial ) : base( serial ) { } - + public override void Serialize( GenericWriter writer ) { base.Serialize( writer ); writer.Write( (int) 0 ); } - + public override void Deserialize(GenericReader reader) { base.Deserialize( reader ); @@ -60,4 +60,4 @@ namespace Server.Items ArmorAttributes.SelfRepair = 1; } } -} \ No newline at end of file +} diff --git a/Scripts/Items/Armor/DaemonBone/DaemonGloves.cs b/Scripts/Items/Armor/DaemonBone/DaemonGloves.cs index 31908b9a1..a8376fb0d 100644 --- a/Scripts/Items/Armor/DaemonBone/DaemonGloves.cs +++ b/Scripts/Items/Armor/DaemonBone/DaemonGloves.cs @@ -6,26 +6,26 @@ namespace Server.Items [FlippableAttribute( 0x1450, 0x1455 )] public class DaemonGloves : BaseArmor { - public override int BasePhysicalResistance{ get{ return 6; } } - public override int BaseFireResistance{ get{ return 6; } } - public override int BaseColdResistance{ get{ return 7; } } - public override int BasePoisonResistance{ get{ return 5; } } - public override int BaseEnergyResistance{ get{ return 7; } } + public override int BasePhysicalResistance => 6; + public override int BaseFireResistance => 6; + public override int BaseColdResistance => 7; + public override int BasePoisonResistance => 5; + public override int BaseEnergyResistance => 7; - public override int InitMinHits{ get{ return 255; } } - public override int InitMaxHits{ get{ return 255; } } + public override int InitMinHits => 255; + public override int InitMaxHits => 255; - public override int AosStrReq{ get{ return 55; } } - public override int OldStrReq{ get{ return 40; } } + public override int AosStrReq => 55; + public override int OldStrReq => 40; - public override int OldDexBonus{ get{ return -1; } } + public override int OldDexBonus => -1; - public override int ArmorBase{ get{ return 46; } } + public override int ArmorBase => 46; - public override ArmorMaterialType MaterialType{ get{ return ArmorMaterialType.Bone; } } - public override CraftResource DefaultResource{ get{ return CraftResource.RegularLeather; } } + public override ArmorMaterialType MaterialType => ArmorMaterialType.Bone; + public override CraftResource DefaultResource => CraftResource.RegularLeather; - public override int LabelNumber{ get{ return 1041373; } } // daemon bone gloves + public override int LabelNumber => 1041373; // daemon bone gloves [Constructible] public DaemonGloves() : base( 0x1450 ) @@ -39,14 +39,14 @@ namespace Server.Items public DaemonGloves( Serial serial ) : base( serial ) { } - + public override void Serialize( GenericWriter writer ) { base.Serialize( writer ); writer.Write( (int) 0 ); } - + public override void Deserialize(GenericReader reader) { base.Deserialize( reader ); @@ -60,4 +60,4 @@ namespace Server.Items ArmorAttributes.SelfRepair = 1; } } -} \ No newline at end of file +} diff --git a/Scripts/Items/Armor/DaemonBone/DaemonLegs.cs b/Scripts/Items/Armor/DaemonBone/DaemonLegs.cs index b9dcc053d..75d1395ec 100644 --- a/Scripts/Items/Armor/DaemonBone/DaemonLegs.cs +++ b/Scripts/Items/Armor/DaemonBone/DaemonLegs.cs @@ -6,26 +6,26 @@ namespace Server.Items [FlippableAttribute( 0x1452, 0x1457 )] public class DaemonLegs : BaseArmor { - public override int BasePhysicalResistance{ get{ return 6; } } - public override int BaseFireResistance{ get{ return 6; } } - public override int BaseColdResistance{ get{ return 7; } } - public override int BasePoisonResistance{ get{ return 5; } } - public override int BaseEnergyResistance{ get{ return 7; } } + public override int BasePhysicalResistance => 6; + public override int BaseFireResistance => 6; + public override int BaseColdResistance => 7; + public override int BasePoisonResistance => 5; + public override int BaseEnergyResistance => 7; - public override int InitMinHits{ get{ return 255; } } - public override int InitMaxHits{ get{ return 255; } } + public override int InitMinHits => 255; + public override int InitMaxHits => 255; - public override int AosStrReq{ get{ return 55; } } - public override int OldStrReq{ get{ return 40; } } + public override int AosStrReq => 55; + public override int OldStrReq => 40; - public override int OldDexBonus{ get{ return -4; } } + public override int OldDexBonus => -4; - public override int ArmorBase{ get{ return 46; } } + public override int ArmorBase => 46; - public override ArmorMaterialType MaterialType{ get{ return ArmorMaterialType.Bone; } } - public override CraftResource DefaultResource{ get{ return CraftResource.RegularLeather; } } + public override ArmorMaterialType MaterialType => ArmorMaterialType.Bone; + public override CraftResource DefaultResource => CraftResource.RegularLeather; - public override int LabelNumber{ get{ return 1041375; } } // daemon bone leggings + public override int LabelNumber => 1041375; // daemon bone leggings [Constructible] public DaemonLegs() : base( 0x1452 ) @@ -39,13 +39,13 @@ namespace Server.Items public DaemonLegs( Serial serial ) : base( serial ) { } - + public override void Serialize( GenericWriter writer ) { base.Serialize( writer ); writer.Write( (int) 0 ); } - + public override void Deserialize(GenericReader reader) { base.Deserialize( reader ); @@ -55,4 +55,4 @@ namespace Server.Items ArmorAttributes.SelfRepair = 1; } } -} \ No newline at end of file +} diff --git a/Scripts/Items/Armor/Dragon/DragonArms.cs b/Scripts/Items/Armor/Dragon/DragonArms.cs index dd5da9518..3cdcca6f3 100644 --- a/Scripts/Items/Armor/Dragon/DragonArms.cs +++ b/Scripts/Items/Armor/Dragon/DragonArms.cs @@ -6,24 +6,24 @@ namespace Server.Items [FlippableAttribute( 0x2657, 0x2658 )] public class DragonArms : BaseArmor { - public override int BasePhysicalResistance{ get{ return 3; } } - public override int BaseFireResistance{ get{ return 3; } } - public override int BaseColdResistance{ get{ return 3; } } - public override int BasePoisonResistance{ get{ return 3; } } - public override int BaseEnergyResistance{ get{ return 3; } } + public override int BasePhysicalResistance => 3; + public override int BaseFireResistance => 3; + public override int BaseColdResistance => 3; + public override int BasePoisonResistance => 3; + public override int BaseEnergyResistance => 3; - public override int InitMinHits{ get{ return 55; } } - public override int InitMaxHits{ get{ return 75; } } + public override int InitMinHits => 55; + public override int InitMaxHits => 75; - public override int AosStrReq{ get{ return 75; } } - public override int OldStrReq{ get{ return 20; } } + public override int AosStrReq => 75; + public override int OldStrReq => 20; - public override int OldDexBonus{ get{ return -2; } } + public override int OldDexBonus => -2; - public override int ArmorBase{ get{ return 40; } } + public override int ArmorBase => 40; - public override ArmorMaterialType MaterialType{ get{ return ArmorMaterialType.Dragon; } } - public override CraftResource DefaultResource{ get{ return CraftResource.RedScales; } } + public override ArmorMaterialType MaterialType => ArmorMaterialType.Dragon; + public override CraftResource DefaultResource => CraftResource.RedScales; [Constructible] public DragonArms() : base( 0x2657 ) @@ -34,13 +34,13 @@ namespace Server.Items public DragonArms( Serial serial ) : base( serial ) { } - + public override void Serialize( GenericWriter writer ) { base.Serialize( writer ); writer.Write( (int) 0 ); } - + public override void Deserialize(GenericReader reader) { base.Deserialize( reader ); @@ -50,4 +50,4 @@ namespace Server.Items Weight = 15.0; } } -} \ No newline at end of file +} diff --git a/Scripts/Items/Armor/Dragon/DragonChest.cs b/Scripts/Items/Armor/Dragon/DragonChest.cs index 8c364ddac..78b87f79b 100644 --- a/Scripts/Items/Armor/Dragon/DragonChest.cs +++ b/Scripts/Items/Armor/Dragon/DragonChest.cs @@ -6,24 +6,24 @@ namespace Server.Items [FlippableAttribute( 0x2641, 0x2642 )] public class DragonChest : BaseArmor { - public override int BasePhysicalResistance{ get{ return 3; } } - public override int BaseFireResistance{ get{ return 3; } } - public override int BaseColdResistance{ get{ return 3; } } - public override int BasePoisonResistance{ get{ return 3; } } - public override int BaseEnergyResistance{ get{ return 3; } } + public override int BasePhysicalResistance => 3; + public override int BaseFireResistance => 3; + public override int BaseColdResistance => 3; + public override int BasePoisonResistance => 3; + public override int BaseEnergyResistance => 3; - public override int InitMinHits{ get{ return 55; } } - public override int InitMaxHits{ get{ return 75; } } + public override int InitMinHits => 55; + public override int InitMaxHits => 75; - public override int AosStrReq{ get{ return 75; } } - public override int OldStrReq{ get{ return 60; } } + public override int AosStrReq => 75; + public override int OldStrReq => 60; - public override int OldDexBonus{ get{ return -8; } } + public override int OldDexBonus => -8; - public override int ArmorBase{ get{ return 40; } } + public override int ArmorBase => 40; - public override ArmorMaterialType MaterialType{ get{ return ArmorMaterialType.Dragon; } } - public override CraftResource DefaultResource{ get{ return CraftResource.RedScales; } } + public override ArmorMaterialType MaterialType => ArmorMaterialType.Dragon; + public override CraftResource DefaultResource => CraftResource.RedScales; [Constructible] public DragonChest() : base( 0x2641 ) @@ -34,13 +34,13 @@ namespace Server.Items public DragonChest( Serial serial ) : base( serial ) { } - + public override void Serialize( GenericWriter writer ) { base.Serialize( writer ); writer.Write( (int) 0 ); } - + public override void Deserialize(GenericReader reader) { base.Deserialize( reader ); @@ -50,4 +50,4 @@ namespace Server.Items Weight = 15.0; } } -} \ No newline at end of file +} diff --git a/Scripts/Items/Armor/Dragon/DragonGloves.cs b/Scripts/Items/Armor/Dragon/DragonGloves.cs index 439e9d443..ce61d55d5 100644 --- a/Scripts/Items/Armor/Dragon/DragonGloves.cs +++ b/Scripts/Items/Armor/Dragon/DragonGloves.cs @@ -6,24 +6,24 @@ namespace Server.Items [FlippableAttribute( 0x2643, 0x2644 )] public class DragonGloves : BaseArmor { - public override int BasePhysicalResistance{ get{ return 3; } } - public override int BaseFireResistance{ get{ return 3; } } - public override int BaseColdResistance{ get{ return 3; } } - public override int BasePoisonResistance{ get{ return 3; } } - public override int BaseEnergyResistance{ get{ return 3; } } + public override int BasePhysicalResistance => 3; + public override int BaseFireResistance => 3; + public override int BaseColdResistance => 3; + public override int BasePoisonResistance => 3; + public override int BaseEnergyResistance => 3; - public override int InitMinHits{ get{ return 55; } } - public override int InitMaxHits{ get{ return 75; } } + public override int InitMinHits => 55; + public override int InitMaxHits => 75; - public override int AosStrReq{ get{ return 75; } } - public override int OldStrReq{ get{ return 30; } } + public override int AosStrReq => 75; + public override int OldStrReq => 30; - public override int OldDexBonus{ get{ return -2; } } + public override int OldDexBonus => -2; - public override int ArmorBase{ get{ return 40; } } + public override int ArmorBase => 40; - public override ArmorMaterialType MaterialType{ get{ return ArmorMaterialType.Dragon; } } - public override CraftResource DefaultResource{ get{ return CraftResource.RedScales; } } + public override ArmorMaterialType MaterialType => ArmorMaterialType.Dragon; + public override CraftResource DefaultResource => CraftResource.RedScales; [Constructible] public DragonGloves() : base( 0x2643 ) @@ -34,13 +34,13 @@ namespace Server.Items public DragonGloves( Serial serial ) : base( serial ) { } - + public override void Serialize( GenericWriter writer ) { base.Serialize( writer ); writer.Write( (int) 0 ); } - + public override void Deserialize(GenericReader reader) { base.Deserialize( reader ); @@ -50,4 +50,4 @@ namespace Server.Items Weight = 2.0; } } -} \ No newline at end of file +} diff --git a/Scripts/Items/Armor/Dragon/DragonHelm.cs b/Scripts/Items/Armor/Dragon/DragonHelm.cs index e6eb064c4..260171760 100644 --- a/Scripts/Items/Armor/Dragon/DragonHelm.cs +++ b/Scripts/Items/Armor/Dragon/DragonHelm.cs @@ -6,24 +6,24 @@ namespace Server.Items [Flippable( 0x2645, 0x2646 )] public class DragonHelm : BaseArmor { - public override int BasePhysicalResistance{ get{ return 3; } } - public override int BaseFireResistance{ get{ return 3; } } - public override int BaseColdResistance{ get{ return 3; } } - public override int BasePoisonResistance{ get{ return 3; } } - public override int BaseEnergyResistance{ get{ return 3; } } + public override int BasePhysicalResistance => 3; + public override int BaseFireResistance => 3; + public override int BaseColdResistance => 3; + public override int BasePoisonResistance => 3; + public override int BaseEnergyResistance => 3; - public override int InitMinHits{ get{ return 55; } } - public override int InitMaxHits{ get{ return 75; } } + public override int InitMinHits => 55; + public override int InitMaxHits => 75; - public override int AosStrReq{ get{ return 75; } } - public override int OldStrReq{ get{ return 40; } } + public override int AosStrReq => 75; + public override int OldStrReq => 40; - public override int OldDexBonus{ get{ return -1; } } + public override int OldDexBonus => -1; - public override int ArmorBase{ get{ return 40; } } + public override int ArmorBase => 40; - public override ArmorMaterialType MaterialType{ get{ return ArmorMaterialType.Dragon; } } - public override CraftResource DefaultResource{ get{ return CraftResource.RedScales; } } + public override ArmorMaterialType MaterialType => ArmorMaterialType.Dragon; + public override CraftResource DefaultResource => CraftResource.RedScales; [Constructible] public DragonHelm() : base( 0x2645 ) @@ -34,13 +34,13 @@ namespace Server.Items public DragonHelm( Serial serial ) : base( serial ) { } - + public override void Serialize( GenericWriter writer ) { base.Serialize( writer ); writer.Write( (int) 0 ); } - + public override void Deserialize(GenericReader reader) { base.Deserialize( reader ); @@ -50,4 +50,4 @@ namespace Server.Items Weight = 5.0; } } -} \ No newline at end of file +} diff --git a/Scripts/Items/Armor/Dragon/DragonLegs.cs b/Scripts/Items/Armor/Dragon/DragonLegs.cs index cbf8d55ea..98f38e89e 100644 --- a/Scripts/Items/Armor/Dragon/DragonLegs.cs +++ b/Scripts/Items/Armor/Dragon/DragonLegs.cs @@ -6,24 +6,24 @@ namespace Server.Items [FlippableAttribute( 0x2647, 0x2648 )] public class DragonLegs : BaseArmor { - public override int BasePhysicalResistance{ get{ return 3; } } - public override int BaseFireResistance{ get{ return 3; } } - public override int BaseColdResistance{ get{ return 3; } } - public override int BasePoisonResistance{ get{ return 3; } } - public override int BaseEnergyResistance{ get{ return 3; } } + public override int BasePhysicalResistance => 3; + public override int BaseFireResistance => 3; + public override int BaseColdResistance => 3; + public override int BasePoisonResistance => 3; + public override int BaseEnergyResistance => 3; - public override int InitMinHits{ get{ return 55; } } - public override int InitMaxHits{ get{ return 75; } } + public override int InitMinHits => 55; + public override int InitMaxHits => 75; - public override int AosStrReq{ get{ return 75; } } - public override int OldStrReq{ get{ return 60; } } + public override int AosStrReq => 75; + public override int OldStrReq => 60; - public override int OldDexBonus{ get{ return -6; } } + public override int OldDexBonus => -6; - public override int ArmorBase{ get{ return 40; } } + public override int ArmorBase => 40; - public override ArmorMaterialType MaterialType{ get{ return ArmorMaterialType.Dragon; } } - public override CraftResource DefaultResource{ get{ return CraftResource.RedScales; } } + public override ArmorMaterialType MaterialType => ArmorMaterialType.Dragon; + public override CraftResource DefaultResource => CraftResource.RedScales; [Constructible] public DragonLegs() : base( 0x2647 ) @@ -34,17 +34,17 @@ namespace Server.Items public DragonLegs( Serial serial ) : base( serial ) { } - + public override void Serialize( GenericWriter writer ) { base.Serialize( writer ); writer.Write( (int) 0 ); } - + public override void Deserialize(GenericReader reader) { base.Deserialize( reader ); int version = reader.ReadInt(); } } -} \ No newline at end of file +} diff --git a/Scripts/Items/Armor/Glasses/AnthropomorphistGlasses.cs b/Scripts/Items/Armor/Glasses/AnthropomorphistGlasses.cs index 0228e854e..a586be6c1 100644 --- a/Scripts/Items/Armor/Glasses/AnthropomorphistGlasses.cs +++ b/Scripts/Items/Armor/Glasses/AnthropomorphistGlasses.cs @@ -5,16 +5,16 @@ namespace Server.Items { public class AnthropomorphistGlasses : ElvenGlasses { - public override int LabelNumber{ get{ return 1073379; } } //Anthropomorphist Reading Glasses + public override int LabelNumber => 1073379; //Anthropomorphist Reading Glasses - public override int BasePhysicalResistance{ get{ return 5; } } - public override int BaseFireResistance{ get{ return 5; } } - public override int BaseColdResistance{ get{ return 10; } } - public override int BasePoisonResistance{ get{ return 20; } } - public override int BaseEnergyResistance{ get{ return 20; } } + public override int BasePhysicalResistance => 5; + public override int BaseFireResistance => 5; + public override int BaseColdResistance => 10; + public override int BasePoisonResistance => 20; + public override int BaseEnergyResistance => 20; - public override int InitMinHits{ get{ return 255; } } - public override int InitMaxHits{ get{ return 255; } } + public override int InitMinHits => 255; + public override int InitMaxHits => 255; [Constructible] @@ -29,13 +29,13 @@ namespace Server.Items public AnthropomorphistGlasses( Serial serial ) : base( serial ) { } - + public override void Serialize( GenericWriter writer ) { base.Serialize( writer ); writer.Write( (int) 1 ); } - + public override void Deserialize(GenericReader reader) { base.Deserialize( reader ); diff --git a/Scripts/Items/Armor/Glasses/ArtsGlasses.cs b/Scripts/Items/Armor/Glasses/ArtsGlasses.cs index b0900b367..e93de0756 100644 --- a/Scripts/Items/Armor/Glasses/ArtsGlasses.cs +++ b/Scripts/Items/Armor/Glasses/ArtsGlasses.cs @@ -5,16 +5,16 @@ namespace Server.Items { public class ArtsGlasses : ElvenGlasses { - public override int LabelNumber{ get{ return 1073363; } } //Reading Glasses of the Arts + public override int LabelNumber => 1073363; //Reading Glasses of the Arts - public override int BasePhysicalResistance{ get{ return 10; } } - public override int BaseFireResistance{ get{ return 8; } } - public override int BaseColdResistance{ get{ return 8; } } - public override int BasePoisonResistance{ get{ return 4; } } - public override int BaseEnergyResistance{ get{ return 10; } } + public override int BasePhysicalResistance => 10; + public override int BaseFireResistance => 8; + public override int BaseColdResistance => 8; + public override int BasePoisonResistance => 4; + public override int BaseEnergyResistance => 10; - public override int InitMinHits{ get{ return 255; } } - public override int InitMaxHits{ get{ return 255; } } + public override int InitMinHits => 255; + public override int InitMaxHits => 255; [Constructible] public ArtsGlasses() @@ -28,13 +28,13 @@ namespace Server.Items public ArtsGlasses( Serial serial ) : base( serial ) { } - + public override void Serialize( GenericWriter writer ) { base.Serialize( writer ); writer.Write( (int) 1 ); } - + public override void Deserialize(GenericReader reader) { base.Deserialize( reader ); diff --git a/Scripts/Items/Armor/Glasses/ElvenGlasses.cs b/Scripts/Items/Armor/Glasses/ElvenGlasses.cs index 8aa4a9f6d..ef37f3130 100644 --- a/Scripts/Items/Armor/Glasses/ElvenGlasses.cs +++ b/Scripts/Items/Armor/Glasses/ElvenGlasses.cs @@ -5,25 +5,25 @@ namespace Server.Items { public class ElvenGlasses : BaseArmor { - public override int LabelNumber{ get{ return 1032216; } } // elven glasses + public override int LabelNumber => 1032216; // elven glasses - public override int BasePhysicalResistance{ get{ return 2; } } - public override int BaseFireResistance{ get{ return 4; } } - public override int BaseColdResistance{ get{ return 4; } } - public override int BasePoisonResistance{ get{ return 3; } } - public override int BaseEnergyResistance{ get{ return 2; } } + public override int BasePhysicalResistance => 2; + public override int BaseFireResistance => 4; + public override int BaseColdResistance => 4; + public override int BasePoisonResistance => 3; + public override int BaseEnergyResistance => 2; - public override int InitMinHits{ get{ return 36; } } - public override int InitMaxHits{ get{ return 48; } } + public override int InitMinHits => 36; + public override int InitMaxHits => 48; - public override int AosStrReq{ get{ return 45; } } - public override int OldStrReq{ get{ return 40; } } + public override int AosStrReq => 45; + public override int OldStrReq => 40; - public override int ArmorBase{ get{ return 30; } } + public override int ArmorBase => 30; - public override ArmorMaterialType MaterialType{ get{ return ArmorMaterialType.Leather; } } - public override CraftResource DefaultResource{ get{ return CraftResource.RegularLeather; } } - public override ArmorMeditationAllowance DefMedAllowance{ get{ return ArmorMeditationAllowance.All; } } + public override ArmorMaterialType MaterialType => ArmorMaterialType.Leather; + public override CraftResource DefaultResource => CraftResource.RegularLeather; + public override ArmorMeditationAllowance DefMedAllowance => ArmorMeditationAllowance.All; private AosWeaponAttributes m_AosWeaponAttributes; diff --git a/Scripts/Items/Armor/Glasses/FoldedSteelGlasses.cs b/Scripts/Items/Armor/Glasses/FoldedSteelGlasses.cs index e65320f75..a66345c86 100644 --- a/Scripts/Items/Armor/Glasses/FoldedSteelGlasses.cs +++ b/Scripts/Items/Armor/Glasses/FoldedSteelGlasses.cs @@ -5,16 +5,16 @@ namespace Server.Items { public class FoldedSteelGlasses : ElvenGlasses { - public override int LabelNumber{ get{ return 1073380; } } //Folded Steel Reading Glasses + public override int LabelNumber => 1073380; //Folded Steel Reading Glasses - public override int BasePhysicalResistance{ get{ return 20; } } - public override int BaseFireResistance{ get{ return 10; } } - public override int BaseColdResistance{ get{ return 10; } } - public override int BasePoisonResistance{ get{ return 10; } } - public override int BaseEnergyResistance{ get{ return 10; } } + public override int BasePhysicalResistance => 20; + public override int BaseFireResistance => 10; + public override int BaseColdResistance => 10; + public override int BasePoisonResistance => 10; + public override int BaseEnergyResistance => 10; - public override int InitMinHits{ get{ return 255; } } - public override int InitMaxHits{ get{ return 255; } } + public override int InitMinHits => 255; + public override int InitMaxHits => 255; [Constructible] public FoldedSteelGlasses() @@ -28,13 +28,13 @@ namespace Server.Items public FoldedSteelGlasses( Serial serial ) : base( serial ) { } - + public override void Serialize( GenericWriter writer ) { base.Serialize( writer ); writer.Write( (int) 1 ); } - + public override void Deserialize(GenericReader reader) { base.Deserialize( reader ); diff --git a/Scripts/Items/Armor/Glasses/LightOfWayGlasses.cs b/Scripts/Items/Armor/Glasses/LightOfWayGlasses.cs index 1d44893c5..d64b454cb 100644 --- a/Scripts/Items/Armor/Glasses/LightOfWayGlasses.cs +++ b/Scripts/Items/Armor/Glasses/LightOfWayGlasses.cs @@ -5,16 +5,16 @@ namespace Server.Items { public class LightOfWayGlasses : ElvenGlasses { - public override int LabelNumber{ get{ return 1073378; } } //Light Of Way Reading Glasses + public override int LabelNumber => 1073378; //Light Of Way Reading Glasses - public override int BasePhysicalResistance{ get{ return 10; } } - public override int BaseFireResistance{ get{ return 10; } } - public override int BaseColdResistance{ get{ return 10; } } - public override int BasePoisonResistance{ get{ return 10; } } - public override int BaseEnergyResistance{ get{ return 10; } } + public override int BasePhysicalResistance => 10; + public override int BaseFireResistance => 10; + public override int BaseColdResistance => 10; + public override int BasePoisonResistance => 10; + public override int BaseEnergyResistance => 10; - public override int InitMinHits{ get{ return 255; } } - public override int InitMaxHits{ get{ return 255; } } + public override int InitMinHits => 255; + public override int InitMaxHits => 255; [Constructible] public LightOfWayGlasses() @@ -28,13 +28,13 @@ namespace Server.Items public LightOfWayGlasses( Serial serial ) : base( serial ) { } - + public override void Serialize( GenericWriter writer ) { base.Serialize( writer ); writer.Write( (int) 1 ); } - + public override void Deserialize(GenericReader reader) { base.Deserialize( reader ); diff --git a/Scripts/Items/Armor/Glasses/LyricalGlasses.cs b/Scripts/Items/Armor/Glasses/LyricalGlasses.cs index f17b9d686..5c448a089 100644 --- a/Scripts/Items/Armor/Glasses/LyricalGlasses.cs +++ b/Scripts/Items/Armor/Glasses/LyricalGlasses.cs @@ -5,16 +5,16 @@ namespace Server.Items { public class LyricalGlasses : ElvenGlasses { - public override int LabelNumber{ get{ return 1073382; } } //Lyrical Reading Glasses + public override int LabelNumber => 1073382; //Lyrical Reading Glasses - public override int BasePhysicalResistance{ get{ return 10; } } - public override int BaseFireResistance{ get{ return 10; } } - public override int BaseColdResistance{ get{ return 10; } } - public override int BasePoisonResistance{ get{ return 10; } } - public override int BaseEnergyResistance{ get{ return 10; } } + public override int BasePhysicalResistance => 10; + public override int BaseFireResistance => 10; + public override int BaseColdResistance => 10; + public override int BasePoisonResistance => 10; + public override int BaseEnergyResistance => 10; - public override int InitMinHits{ get{ return 255; } } - public override int InitMaxHits{ get{ return 255; } } + public override int InitMinHits => 255; + public override int InitMaxHits => 255; [Constructible] public LyricalGlasses() @@ -28,13 +28,13 @@ namespace Server.Items public LyricalGlasses( Serial serial ) : base( serial ) { } - + public override void Serialize( GenericWriter writer ) { base.Serialize( writer ); writer.Write( (int) 1 ); } - + public override void Deserialize(GenericReader reader) { base.Deserialize( reader ); diff --git a/Scripts/Items/Armor/Glasses/MaceShieldGlasses.cs b/Scripts/Items/Armor/Glasses/MaceShieldGlasses.cs index 71b941cf1..f486edde5 100644 --- a/Scripts/Items/Armor/Glasses/MaceShieldGlasses.cs +++ b/Scripts/Items/Armor/Glasses/MaceShieldGlasses.cs @@ -5,16 +5,16 @@ namespace Server.Items { public class MaceShieldGlasses : ElvenGlasses { - public override int LabelNumber{ get{ return 1073381; } } //Mace And Shield Reading Glasses + public override int LabelNumber => 1073381; //Mace And Shield Reading Glasses - public override int BasePhysicalResistance{ get{ return 25; } } - public override int BaseFireResistance{ get{ return 10; } } - public override int BaseColdResistance{ get{ return 10; } } - public override int BasePoisonResistance{ get{ return 10; } } - public override int BaseEnergyResistance{ get{ return 10; } } + public override int BasePhysicalResistance => 25; + public override int BaseFireResistance => 10; + public override int BaseColdResistance => 10; + public override int BasePoisonResistance => 10; + public override int BaseEnergyResistance => 10; - public override int InitMinHits{ get{ return 255; } } - public override int InitMaxHits{ get{ return 255; } } + public override int InitMinHits => 255; + public override int InitMaxHits => 255; [Constructible] public MaceShieldGlasses() @@ -28,13 +28,13 @@ namespace Server.Items public MaceShieldGlasses( Serial serial ) : base( serial ) { } - + public override void Serialize( GenericWriter writer ) { base.Serialize( writer ); writer.Write( (int) 1 ); } - + public override void Deserialize(GenericReader reader) { base.Deserialize( reader ); diff --git a/Scripts/Items/Armor/Glasses/MaritimeGlasses.cs b/Scripts/Items/Armor/Glasses/MaritimeGlasses.cs index 819d1f485..fc2682bc2 100644 --- a/Scripts/Items/Armor/Glasses/MaritimeGlasses.cs +++ b/Scripts/Items/Armor/Glasses/MaritimeGlasses.cs @@ -5,16 +5,16 @@ namespace Server.Items { public class MaritimeGlasses : ElvenGlasses { - public override int LabelNumber{ get{ return 1073364; } } //Maritime Reading Glasses + public override int LabelNumber => 1073364; //Maritime Reading Glasses - public override int BasePhysicalResistance{ get{ return 3; } } - public override int BaseFireResistance{ get{ return 4; } } - public override int BaseColdResistance{ get{ return 30; } } - public override int BasePoisonResistance{ get{ return 5; } } - public override int BaseEnergyResistance{ get{ return 3; } } + public override int BasePhysicalResistance => 3; + public override int BaseFireResistance => 4; + public override int BaseColdResistance => 30; + public override int BasePoisonResistance => 5; + public override int BaseEnergyResistance => 3; - public override int InitMinHits{ get{ return 255; } } - public override int InitMaxHits{ get{ return 255; } } + public override int InitMinHits => 255; + public override int InitMaxHits => 255; [Constructible] public MaritimeGlasses() @@ -28,13 +28,13 @@ namespace Server.Items public MaritimeGlasses( Serial serial ) : base( serial ) { } - + public override void Serialize( GenericWriter writer ) { base.Serialize( writer ); writer.Write( (int) 1 ); } - + public override void Deserialize(GenericReader reader) { base.Deserialize( reader ); diff --git a/Scripts/Items/Armor/Glasses/NecromanticGlasses.cs b/Scripts/Items/Armor/Glasses/NecromanticGlasses.cs index 6c1c2976d..529c117b0 100644 --- a/Scripts/Items/Armor/Glasses/NecromanticGlasses.cs +++ b/Scripts/Items/Armor/Glasses/NecromanticGlasses.cs @@ -5,16 +5,16 @@ namespace Server.Items { public class NecromanticGlasses : ElvenGlasses { - public override int LabelNumber{ get{ return 1073377; } } //Necromantic Reading Glasses + public override int LabelNumber => 1073377; //Necromantic Reading Glasses - public override int BasePhysicalResistance{ get{ return 0; } } - public override int BaseFireResistance{ get{ return 0; } } - public override int BaseColdResistance{ get{ return 0; } } - public override int BasePoisonResistance{ get{ return 0; } } - public override int BaseEnergyResistance{ get{ return 0; } } + public override int BasePhysicalResistance => 0; + public override int BaseFireResistance => 0; + public override int BaseColdResistance => 0; + public override int BasePoisonResistance => 0; + public override int BaseEnergyResistance => 0; - public override int InitMinHits{ get{ return 255; } } - public override int InitMaxHits{ get{ return 255; } } + public override int InitMinHits => 255; + public override int InitMaxHits => 255; [Constructible] public NecromanticGlasses() @@ -27,13 +27,13 @@ namespace Server.Items public NecromanticGlasses( Serial serial ) : base( serial ) { } - + public override void Serialize( GenericWriter writer ) { base.Serialize( writer ); writer.Write( (int) 1 ); } - + public override void Deserialize(GenericReader reader) { base.Deserialize( reader ); diff --git a/Scripts/Items/Armor/Glasses/PoisonedGlasses.cs b/Scripts/Items/Armor/Glasses/PoisonedGlasses.cs index 73c1277fe..02a47eeaf 100644 --- a/Scripts/Items/Armor/Glasses/PoisonedGlasses.cs +++ b/Scripts/Items/Armor/Glasses/PoisonedGlasses.cs @@ -5,16 +5,16 @@ namespace Server.Items { public class PoisonedGlasses : ElvenGlasses { - public override int LabelNumber{ get{ return 1073376; } } //Poisoned Reading Glasses + public override int LabelNumber => 1073376; //Poisoned Reading Glasses - public override int BasePhysicalResistance{ get{ return 10; } } - public override int BaseFireResistance{ get{ return 10; } } - public override int BaseColdResistance{ get{ return 10; } } - public override int BasePoisonResistance{ get{ return 30; } } - public override int BaseEnergyResistance{ get{ return 10; } } + public override int BasePhysicalResistance => 10; + public override int BaseFireResistance => 10; + public override int BaseColdResistance => 10; + public override int BasePoisonResistance => 30; + public override int BaseEnergyResistance => 10; - public override int InitMinHits{ get{ return 255; } } - public override int InitMaxHits{ get{ return 255; } } + public override int InitMinHits => 255; + public override int InitMaxHits => 255; [Constructible] public PoisonedGlasses() @@ -27,13 +27,13 @@ namespace Server.Items public PoisonedGlasses( Serial serial ) : base( serial ) { } - + public override void Serialize( GenericWriter writer ) { base.Serialize( writer ); writer.Write( (int) 1 ); } - + public override void Deserialize(GenericReader reader) { base.Deserialize( reader ); diff --git a/Scripts/Items/Armor/Glasses/TradeGlasses.cs b/Scripts/Items/Armor/Glasses/TradeGlasses.cs index 1751a98fd..3c1400ee0 100644 --- a/Scripts/Items/Armor/Glasses/TradeGlasses.cs +++ b/Scripts/Items/Armor/Glasses/TradeGlasses.cs @@ -5,16 +5,16 @@ namespace Server.Items { public class TradeGlasses : ElvenGlasses { - public override int LabelNumber{ get{ return 1073362; } } //Reading Glasses of the Trades + public override int LabelNumber => 1073362; //Reading Glasses of the Trades - public override int BasePhysicalResistance{ get{ return 10; } } - public override int BaseFireResistance{ get{ return 10; } } - public override int BaseColdResistance{ get{ return 10; } } - public override int BasePoisonResistance{ get{ return 10; } } - public override int BaseEnergyResistance{ get{ return 10; } } + public override int BasePhysicalResistance => 10; + public override int BaseFireResistance => 10; + public override int BaseColdResistance => 10; + public override int BasePoisonResistance => 10; + public override int BaseEnergyResistance => 10; - public override int InitMinHits{ get{ return 255; } } - public override int InitMaxHits{ get{ return 255; } } + public override int InitMinHits => 255; + public override int InitMaxHits => 255; [Constructible] public TradeGlasses() @@ -25,13 +25,13 @@ namespace Server.Items public TradeGlasses( Serial serial ) : base( serial ) { } - + public override void Serialize( GenericWriter writer ) { base.Serialize( writer ); writer.Write( (int) 0 ); } - + public override void Deserialize(GenericReader reader) { base.Deserialize( reader ); diff --git a/Scripts/Items/Armor/Glasses/TreasureTrinketGlasses.cs b/Scripts/Items/Armor/Glasses/TreasureTrinketGlasses.cs index 0beb4c8ff..b3daad3b9 100644 --- a/Scripts/Items/Armor/Glasses/TreasureTrinketGlasses.cs +++ b/Scripts/Items/Armor/Glasses/TreasureTrinketGlasses.cs @@ -5,16 +5,16 @@ namespace Server.Items { public class TreasureTrinketGlasses : ElvenGlasses { - public override int LabelNumber{ get{ return 1073373; } } //Treasures and Trinkets Reading Glasses + public override int LabelNumber => 1073373; //Treasures and Trinkets Reading Glasses - public override int BasePhysicalResistance{ get{ return 10; } } - public override int BaseFireResistance{ get{ return 10; } } - public override int BaseColdResistance{ get{ return 10; } } - public override int BasePoisonResistance{ get{ return 10; } } - public override int BaseEnergyResistance{ get{ return 10; } } + public override int BasePhysicalResistance => 10; + public override int BaseFireResistance => 10; + public override int BaseColdResistance => 10; + public override int BasePoisonResistance => 10; + public override int BaseEnergyResistance => 10; - public override int InitMinHits{ get{ return 255; } } - public override int InitMaxHits{ get{ return 255; } } + public override int InitMinHits => 255; + public override int InitMaxHits => 255; [Constructible] public TreasureTrinketGlasses() @@ -28,13 +28,13 @@ namespace Server.Items public TreasureTrinketGlasses( Serial serial ) : base( serial ) { } - + public override void Serialize( GenericWriter writer ) { base.Serialize( writer ); writer.Write( (int) 1 ); } - + public override void Deserialize(GenericReader reader) { base.Deserialize( reader ); diff --git a/Scripts/Items/Armor/Glasses/WizardsGlasses.cs b/Scripts/Items/Armor/Glasses/WizardsGlasses.cs index 1506837ba..99660422b 100644 --- a/Scripts/Items/Armor/Glasses/WizardsGlasses.cs +++ b/Scripts/Items/Armor/Glasses/WizardsGlasses.cs @@ -5,16 +5,16 @@ namespace Server.Items { public class WizardsGlasses : ElvenGlasses { - public override int LabelNumber{ get{ return 1073374; } } //Wizard's Crystal Reading Glasses + public override int LabelNumber => 1073374; //Wizard's Crystal Reading Glasses - public override int BasePhysicalResistance{ get{ return 5; } } - public override int BaseFireResistance{ get{ return 5; } } - public override int BaseColdResistance{ get{ return 5; } } - public override int BasePoisonResistance{ get{ return 5; } } - public override int BaseEnergyResistance{ get{ return 5; } } + public override int BasePhysicalResistance => 5; + public override int BaseFireResistance => 5; + public override int BaseColdResistance => 5; + public override int BasePoisonResistance => 5; + public override int BaseEnergyResistance => 5; - public override int InitMinHits{ get{ return 255; } } - public override int InitMaxHits{ get{ return 255; } } + public override int InitMinHits => 255; + public override int InitMaxHits => 255; [Constructible] public WizardsGlasses() @@ -28,13 +28,13 @@ namespace Server.Items public WizardsGlasses( Serial serial ) : base( serial ) { } - + public override void Serialize( GenericWriter writer ) { base.Serialize( writer ); writer.Write( (int) 1 ); } - + public override void Deserialize(GenericReader reader) { base.Deserialize( reader ); diff --git a/Scripts/Items/Armor/Helmets/Bascinet.cs b/Scripts/Items/Armor/Helmets/Bascinet.cs index 3a8274d05..1902ddaf6 100644 --- a/Scripts/Items/Armor/Helmets/Bascinet.cs +++ b/Scripts/Items/Armor/Helmets/Bascinet.cs @@ -5,21 +5,21 @@ namespace Server.Items { public class Bascinet : BaseArmor { - public override int BasePhysicalResistance{ get{ return 7; } } - public override int BaseFireResistance{ get{ return 2; } } - public override int BaseColdResistance{ get{ return 2; } } - public override int BasePoisonResistance{ get{ return 2; } } - public override int BaseEnergyResistance{ get{ return 2; } } + public override int BasePhysicalResistance => 7; + public override int BaseFireResistance => 2; + public override int BaseColdResistance => 2; + public override int BasePoisonResistance => 2; + public override int BaseEnergyResistance => 2; - public override int InitMinHits{ get{ return 40; } } - public override int InitMaxHits{ get{ return 50; } } + public override int InitMinHits => 40; + public override int InitMaxHits => 50; - public override int AosStrReq{ get{ return 40; } } - public override int OldStrReq{ get{ return 10; } } + public override int AosStrReq => 40; + public override int OldStrReq => 10; - public override int ArmorBase{ get{ return 18; } } + public override int ArmorBase => 18; - public override ArmorMaterialType MaterialType{ get{ return ArmorMaterialType.Plate; } } + public override ArmorMaterialType MaterialType => ArmorMaterialType.Plate; [Constructible] public Bascinet() : base( 0x140C ) @@ -30,13 +30,13 @@ namespace Server.Items public Bascinet( Serial serial ) : base( serial ) { } - + public override void Serialize( GenericWriter writer ) { base.Serialize( writer ); writer.Write( (int) 0 ); } - + public override void Deserialize(GenericReader reader) { base.Deserialize( reader ); @@ -46,4 +46,4 @@ namespace Server.Items Weight = 5.0; } } -} \ No newline at end of file +} diff --git a/Scripts/Items/Armor/Helmets/BoneHelm.cs b/Scripts/Items/Armor/Helmets/BoneHelm.cs index 61a46f97d..19558d5fd 100644 --- a/Scripts/Items/Armor/Helmets/BoneHelm.cs +++ b/Scripts/Items/Armor/Helmets/BoneHelm.cs @@ -6,21 +6,21 @@ namespace Server.Items [FlippableAttribute( 0x1451, 0x1456 )] public class BoneHelm : BaseArmor { - public override int BasePhysicalResistance{ get{ return 3; } } - public override int BaseFireResistance{ get{ return 3; } } - public override int BaseColdResistance{ get{ return 4; } } - public override int BasePoisonResistance{ get{ return 2; } } - public override int BaseEnergyResistance{ get{ return 4; } } + public override int BasePhysicalResistance => 3; + public override int BaseFireResistance => 3; + public override int BaseColdResistance => 4; + public override int BasePoisonResistance => 2; + public override int BaseEnergyResistance => 4; - public override int InitMinHits{ get{ return 25; } } - public override int InitMaxHits{ get{ return 30; } } + public override int InitMinHits => 25; + public override int InitMaxHits => 30; - public override int AosStrReq{ get{ return 20; } } - public override int OldStrReq{ get{ return 40; } } + public override int AosStrReq => 20; + public override int OldStrReq => 40; - public override int ArmorBase{ get{ return 30; } } + public override int ArmorBase => 30; - public override ArmorMaterialType MaterialType{ get{ return ArmorMaterialType.Plate; } } + public override ArmorMaterialType MaterialType => ArmorMaterialType.Plate; [Constructible] public BoneHelm() : base( 0x1451 ) @@ -31,7 +31,7 @@ namespace Server.Items public BoneHelm( Serial serial ) : base( serial ) { } - + public override void Serialize( GenericWriter writer ) { base.Serialize( writer ); @@ -40,11 +40,11 @@ namespace Server.Items if ( Weight == 1.0 ) Weight = 3.0; } - + public override void Deserialize(GenericReader reader) { base.Deserialize( reader ); int version = reader.ReadInt(); } } -} \ No newline at end of file +} diff --git a/Scripts/Items/Armor/Helmets/ChainCoif.cs b/Scripts/Items/Armor/Helmets/ChainCoif.cs index d8428c032..9899de2bd 100644 --- a/Scripts/Items/Armor/Helmets/ChainCoif.cs +++ b/Scripts/Items/Armor/Helmets/ChainCoif.cs @@ -6,21 +6,21 @@ namespace Server.Items [FlippableAttribute( 0x13BB, 0x13C0 )] public class ChainCoif : BaseArmor { - public override int BasePhysicalResistance{ get{ return 4; } } - public override int BaseFireResistance{ get{ return 4; } } - public override int BaseColdResistance{ get{ return 4; } } - public override int BasePoisonResistance{ get{ return 1; } } - public override int BaseEnergyResistance{ get{ return 2; } } + public override int BasePhysicalResistance => 4; + public override int BaseFireResistance => 4; + public override int BaseColdResistance => 4; + public override int BasePoisonResistance => 1; + public override int BaseEnergyResistance => 2; - public override int InitMinHits{ get{ return 35; } } - public override int InitMaxHits{ get{ return 60; } } + public override int InitMinHits => 35; + public override int InitMaxHits => 60; - public override int AosStrReq{ get{ return 60; } } - public override int OldStrReq{ get{ return 20; } } + public override int AosStrReq => 60; + public override int OldStrReq => 20; - public override int ArmorBase{ get{ return 28; } } + public override int ArmorBase => 28; - public override ArmorMaterialType MaterialType{ get{ return ArmorMaterialType.Chainmail; } } + public override ArmorMaterialType MaterialType => ArmorMaterialType.Chainmail; [Constructible] public ChainCoif() : base( 0x13BB ) @@ -31,17 +31,17 @@ namespace Server.Items public ChainCoif( Serial serial ) : base( serial ) { } - + public override void Serialize( GenericWriter writer ) { base.Serialize( writer ); writer.Write( (int) 0 ); } - + public override void Deserialize(GenericReader reader) { base.Deserialize( reader ); int version = reader.ReadInt(); } } -} \ No newline at end of file +} diff --git a/Scripts/Items/Armor/Helmets/Circlet.cs b/Scripts/Items/Armor/Helmets/Circlet.cs index 786b70ad4..42ce7ece6 100644 --- a/Scripts/Items/Armor/Helmets/Circlet.cs +++ b/Scripts/Items/Armor/Helmets/Circlet.cs @@ -6,25 +6,25 @@ namespace Server.Items [FlippableAttribute( 0x2B6E, 0x3165 )] public class Circlet : BaseArmor { - public override int BasePhysicalResistance{ get{ return 1; } } - public override int BaseFireResistance{ get{ return 5; } } - public override int BaseColdResistance{ get{ return 2; } } - public override int BasePoisonResistance{ get{ return 2; } } - public override int BaseEnergyResistance{ get{ return 5; } } + public override int BasePhysicalResistance => 1; + public override int BaseFireResistance => 5; + public override int BaseColdResistance => 2; + public override int BasePoisonResistance => 2; + public override int BaseEnergyResistance => 5; - public override int InitMinHits{ get{ return 50; } } - public override int InitMaxHits{ get{ return 65; } } + public override int InitMinHits => 50; + public override int InitMaxHits => 65; - public override int AosStrReq{ get{ return 10; } } - public override int OldStrReq{ get{ return 10; } } + public override int AosStrReq => 10; + public override int OldStrReq => 10; - public override int ArmorBase{ get{ return 30; } } + public override int ArmorBase => 30; - public override ArmorMaterialType MaterialType{ get{ return ArmorMaterialType.Plate; } } + public override ArmorMaterialType MaterialType => ArmorMaterialType.Plate; - public override ArmorMeditationAllowance DefMedAllowance{ get{ return ArmorMeditationAllowance.All; } } + public override ArmorMeditationAllowance DefMedAllowance => ArmorMeditationAllowance.All; - public override Race RequiredRace{ get { return Race.Elf; } } + public override Race RequiredRace => Race.Elf; [Constructible] public Circlet() : base( 0x2B6E ) @@ -50,4 +50,4 @@ namespace Server.Items int version = reader.ReadEncodedInt(); } } -} \ No newline at end of file +} diff --git a/Scripts/Items/Armor/Helmets/CloseHelm.cs b/Scripts/Items/Armor/Helmets/CloseHelm.cs index 342b59c77..651022458 100644 --- a/Scripts/Items/Armor/Helmets/CloseHelm.cs +++ b/Scripts/Items/Armor/Helmets/CloseHelm.cs @@ -5,21 +5,21 @@ namespace Server.Items { public class CloseHelm : BaseArmor { - public override int BasePhysicalResistance{ get{ return 3; } } - public override int BaseFireResistance{ get{ return 3; } } - public override int BaseColdResistance{ get{ return 3; } } - public override int BasePoisonResistance{ get{ return 3; } } - public override int BaseEnergyResistance{ get{ return 3; } } + public override int BasePhysicalResistance => 3; + public override int BaseFireResistance => 3; + public override int BaseColdResistance => 3; + public override int BasePoisonResistance => 3; + public override int BaseEnergyResistance => 3; - public override int InitMinHits{ get{ return 45; } } - public override int InitMaxHits{ get{ return 60; } } + public override int InitMinHits => 45; + public override int InitMaxHits => 60; - public override int AosStrReq{ get{ return 55; } } - public override int OldStrReq{ get{ return 40; } } + public override int AosStrReq => 55; + public override int OldStrReq => 40; - public override int ArmorBase{ get{ return 30; } } + public override int ArmorBase => 30; - public override ArmorMaterialType MaterialType{ get{ return ArmorMaterialType.Plate; } } + public override ArmorMaterialType MaterialType => ArmorMaterialType.Plate; [Constructible] public CloseHelm() : base( 0x1408 ) @@ -30,13 +30,13 @@ namespace Server.Items public CloseHelm( Serial serial ) : base( serial ) { } - + public override void Serialize( GenericWriter writer ) { base.Serialize( writer ); writer.Write( (int) 0 ); } - + public override void Deserialize(GenericReader reader) { base.Deserialize( reader ); @@ -46,4 +46,4 @@ namespace Server.Items Weight = 5.0; } } -} \ No newline at end of file +} diff --git a/Scripts/Items/Armor/Helmets/DaemonHelm.cs b/Scripts/Items/Armor/Helmets/DaemonHelm.cs index 8d3d3f312..7deacc76b 100644 --- a/Scripts/Items/Armor/Helmets/DaemonHelm.cs +++ b/Scripts/Items/Armor/Helmets/DaemonHelm.cs @@ -6,24 +6,24 @@ namespace Server.Items [FlippableAttribute( 0x1451, 0x1456 )] public class DaemonHelm : BaseArmor { - public override int BasePhysicalResistance{ get{ return 6; } } - public override int BaseFireResistance{ get{ return 6; } } - public override int BaseColdResistance{ get{ return 7; } } - public override int BasePoisonResistance{ get{ return 5; } } - public override int BaseEnergyResistance{ get{ return 7; } } + public override int BasePhysicalResistance => 6; + public override int BaseFireResistance => 6; + public override int BaseColdResistance => 7; + public override int BasePoisonResistance => 5; + public override int BaseEnergyResistance => 7; - public override int InitMinHits{ get{ return 255; } } - public override int InitMaxHits{ get{ return 255; } } + public override int InitMinHits => 255; + public override int InitMaxHits => 255; - public override int AosStrReq{ get{ return 20; } } - public override int OldStrReq{ get{ return 40; } } + public override int AosStrReq => 20; + public override int OldStrReq => 40; - public override int ArmorBase{ get{ return 46; } } + public override int ArmorBase => 46; - public override ArmorMaterialType MaterialType{ get{ return ArmorMaterialType.Bone; } } - public override CraftResource DefaultResource{ get{ return CraftResource.RegularLeather; } } + public override ArmorMaterialType MaterialType => ArmorMaterialType.Bone; + public override CraftResource DefaultResource => CraftResource.RegularLeather; - public override int LabelNumber{ get{ return 1041374; } } // daemon bone helmet + public override int LabelNumber => 1041374; // daemon bone helmet [Constructible] public DaemonHelm() : base( 0x1451 ) @@ -37,14 +37,14 @@ namespace Server.Items public DaemonHelm( Serial serial ) : base( serial ) { } - + public override void Serialize( GenericWriter writer ) { base.Serialize( writer ); writer.Write( (int) 0 ); } - + public override void Deserialize(GenericReader reader) { base.Deserialize( reader ); @@ -58,4 +58,4 @@ namespace Server.Items ArmorAttributes.SelfRepair = 1; } } -} \ No newline at end of file +} diff --git a/Scripts/Items/Armor/Helmets/GemmedCirclet.cs b/Scripts/Items/Armor/Helmets/GemmedCirclet.cs index 9180b0426..7de886acf 100644 --- a/Scripts/Items/Armor/Helmets/GemmedCirclet.cs +++ b/Scripts/Items/Armor/Helmets/GemmedCirclet.cs @@ -6,25 +6,25 @@ namespace Server.Items [FlippableAttribute( 0x2B70, 0x3167 )] public class GemmedCirclet : BaseArmor { - public override Race RequiredRace { get { return Race.Elf; } } + public override Race RequiredRace => Race.Elf; - public override int BasePhysicalResistance{ get{ return 1; } } - public override int BaseFireResistance{ get{ return 5; } } - public override int BaseColdResistance{ get{ return 2; } } - public override int BasePoisonResistance{ get{ return 2; } } - public override int BaseEnergyResistance{ get{ return 5; } } + public override int BasePhysicalResistance => 1; + public override int BaseFireResistance => 5; + public override int BaseColdResistance => 2; + public override int BasePoisonResistance => 2; + public override int BaseEnergyResistance => 5; - public override int InitMinHits{ get{ return 20; } } - public override int InitMaxHits{ get{ return 35; } } + public override int InitMinHits => 20; + public override int InitMaxHits => 35; - public override int AosStrReq{ get{ return 10; } } - public override int OldStrReq{ get{ return 10; } } + public override int AosStrReq => 10; + public override int OldStrReq => 10; - public override int ArmorBase{ get{ return 30; } } + public override int ArmorBase => 30; - public override ArmorMaterialType MaterialType{ get{ return ArmorMaterialType.Plate; } } + public override ArmorMaterialType MaterialType => ArmorMaterialType.Plate; - public override ArmorMeditationAllowance DefMedAllowance{ get{ return ArmorMeditationAllowance.All; } } + public override ArmorMeditationAllowance DefMedAllowance => ArmorMeditationAllowance.All; [Constructible] public GemmedCirclet() : base( 0x2B70 ) @@ -50,4 +50,4 @@ namespace Server.Items int version = reader.ReadEncodedInt(); } } -} \ No newline at end of file +} diff --git a/Scripts/Items/Armor/Helmets/Helmet.cs b/Scripts/Items/Armor/Helmets/Helmet.cs index b2830d14f..638448eda 100644 --- a/Scripts/Items/Armor/Helmets/Helmet.cs +++ b/Scripts/Items/Armor/Helmets/Helmet.cs @@ -5,21 +5,21 @@ namespace Server.Items { public class Helmet : BaseArmor { - public override int BasePhysicalResistance{ get{ return 2; } } - public override int BaseFireResistance{ get{ return 4; } } - public override int BaseColdResistance{ get{ return 4; } } - public override int BasePoisonResistance{ get{ return 3; } } - public override int BaseEnergyResistance{ get{ return 2; } } + public override int BasePhysicalResistance => 2; + public override int BaseFireResistance => 4; + public override int BaseColdResistance => 4; + public override int BasePoisonResistance => 3; + public override int BaseEnergyResistance => 2; - public override int InitMinHits{ get{ return 45; } } - public override int InitMaxHits{ get{ return 60; } } + public override int InitMinHits => 45; + public override int InitMaxHits => 60; - public override int AosStrReq{ get{ return 45; } } - public override int OldStrReq{ get{ return 40; } } + public override int AosStrReq => 45; + public override int OldStrReq => 40; - public override int ArmorBase{ get{ return 30; } } + public override int ArmorBase => 30; - public override ArmorMaterialType MaterialType{ get{ return ArmorMaterialType.Plate; } } + public override ArmorMaterialType MaterialType => ArmorMaterialType.Plate; [Constructible] public Helmet() : base( 0x140A ) @@ -30,13 +30,13 @@ namespace Server.Items public Helmet( Serial serial ) : base( serial ) { } - + public override void Serialize( GenericWriter writer ) { base.Serialize( writer ); writer.Write( (int) 0 ); } - + public override void Deserialize(GenericReader reader) { base.Deserialize( reader ); @@ -46,4 +46,4 @@ namespace Server.Items Weight = 5.0; } } -} \ No newline at end of file +} diff --git a/Scripts/Items/Armor/Helmets/LeatherCap.cs b/Scripts/Items/Armor/Helmets/LeatherCap.cs index 40bcaa33f..056efd955 100644 --- a/Scripts/Items/Armor/Helmets/LeatherCap.cs +++ b/Scripts/Items/Armor/Helmets/LeatherCap.cs @@ -6,24 +6,24 @@ namespace Server.Items [FlippableAttribute( 0x1db9, 0x1dba )] public class LeatherCap : BaseArmor { - public override int BasePhysicalResistance{ get{ return 2; } } - public override int BaseFireResistance{ get{ return 4; } } - public override int BaseColdResistance{ get{ return 3; } } - public override int BasePoisonResistance{ get{ return 3; } } - public override int BaseEnergyResistance{ get{ return 3; } } + public override int BasePhysicalResistance => 2; + public override int BaseFireResistance => 4; + public override int BaseColdResistance => 3; + public override int BasePoisonResistance => 3; + public override int BaseEnergyResistance => 3; - public override int InitMinHits{ get{ return 30; } } - public override int InitMaxHits{ get{ return 40; } } + public override int InitMinHits => 30; + public override int InitMaxHits => 40; - public override int AosStrReq{ get{ return 20; } } - public override int OldStrReq{ get{ return 15; } } + public override int AosStrReq => 20; + public override int OldStrReq => 15; - public override int ArmorBase{ get{ return 13; } } + public override int ArmorBase => 13; - public override ArmorMaterialType MaterialType{ get{ return ArmorMaterialType.Leather; } } - public override CraftResource DefaultResource{ get{ return CraftResource.RegularLeather; } } + public override ArmorMaterialType MaterialType => ArmorMaterialType.Leather; + public override CraftResource DefaultResource => CraftResource.RegularLeather; - public override ArmorMeditationAllowance DefMedAllowance{ get{ return ArmorMeditationAllowance.All; } } + public override ArmorMeditationAllowance DefMedAllowance => ArmorMeditationAllowance.All; [Constructible] public LeatherCap() : base( 0x1DB9 ) @@ -34,13 +34,13 @@ namespace Server.Items public LeatherCap( Serial serial ) : base( serial ) { } - + public override void Serialize( GenericWriter writer ) { base.Serialize( writer ); writer.Write( (int) 0 ); } - + public override void Deserialize(GenericReader reader) { base.Deserialize( reader ); @@ -50,4 +50,4 @@ namespace Server.Items Weight = 2.0; } } -} \ No newline at end of file +} diff --git a/Scripts/Items/Armor/Helmets/NorseHelm.cs b/Scripts/Items/Armor/Helmets/NorseHelm.cs index bd9d20a96..2297238dc 100644 --- a/Scripts/Items/Armor/Helmets/NorseHelm.cs +++ b/Scripts/Items/Armor/Helmets/NorseHelm.cs @@ -5,21 +5,21 @@ namespace Server.Items { public class NorseHelm : BaseArmor { - public override int BasePhysicalResistance{ get{ return 4; } } - public override int BaseFireResistance{ get{ return 1; } } - public override int BaseColdResistance{ get{ return 4; } } - public override int BasePoisonResistance{ get{ return 4; } } - public override int BaseEnergyResistance{ get{ return 2; } } + public override int BasePhysicalResistance => 4; + public override int BaseFireResistance => 1; + public override int BaseColdResistance => 4; + public override int BasePoisonResistance => 4; + public override int BaseEnergyResistance => 2; - public override int InitMinHits{ get{ return 45; } } - public override int InitMaxHits{ get{ return 60; } } + public override int InitMinHits => 45; + public override int InitMaxHits => 60; - public override int AosStrReq{ get{ return 55; } } - public override int OldStrReq{ get{ return 40; } } + public override int AosStrReq => 55; + public override int OldStrReq => 40; - public override int ArmorBase{ get{ return 30; } } + public override int ArmorBase => 30; - public override ArmorMaterialType MaterialType{ get{ return ArmorMaterialType.Plate; } } + public override ArmorMaterialType MaterialType => ArmorMaterialType.Plate; [Constructible] public NorseHelm() : base( 0x140E ) @@ -30,13 +30,13 @@ namespace Server.Items public NorseHelm( Serial serial ) : base( serial ) { } - + public override void Serialize( GenericWriter writer ) { base.Serialize( writer ); writer.Write( (int) 0 ); } - + public override void Deserialize(GenericReader reader) { base.Deserialize( reader ); @@ -46,4 +46,4 @@ namespace Server.Items Weight = 5.0; } } -} \ No newline at end of file +} diff --git a/Scripts/Items/Armor/Helmets/OrcHelm.cs b/Scripts/Items/Armor/Helmets/OrcHelm.cs index 92852b08d..db78f0a92 100644 --- a/Scripts/Items/Armor/Helmets/OrcHelm.cs +++ b/Scripts/Items/Armor/Helmets/OrcHelm.cs @@ -5,26 +5,26 @@ namespace Server.Items { public class OrcHelm : BaseArmor { - public override int BasePhysicalResistance{ get{ return 3; } } - public override int BaseFireResistance{ get{ return 1; } } - public override int BaseColdResistance{ get{ return 3; } } - public override int BasePoisonResistance{ get{ return 3; } } - public override int BaseEnergyResistance{ get{ return 5; } } + public override int BasePhysicalResistance => 3; + public override int BaseFireResistance => 1; + public override int BaseColdResistance => 3; + public override int BasePoisonResistance => 3; + public override int BaseEnergyResistance => 5; - public override int InitMinHits{ get{ return 30; } } - public override int InitMaxHits{ get{ return 50; } } + public override int InitMinHits => 30; + public override int InitMaxHits => 50; - public override int AosStrReq{ get{ return 30; } } - public override int OldStrReq{ get{ return 10; } } + public override int AosStrReq => 30; + public override int OldStrReq => 10; - public override int ArmorBase{ get{ return 20; } } + public override int ArmorBase => 20; - public override double DefaultWeight { get { return 5; } } + public override double DefaultWeight => 5; - public override ArmorMaterialType MaterialType{ get{ return ArmorMaterialType.Leather; } } - public override CraftResource DefaultResource{ get{ return CraftResource.RegularLeather; } } + public override ArmorMaterialType MaterialType => ArmorMaterialType.Leather; + public override CraftResource DefaultResource => CraftResource.RegularLeather; - public override ArmorMeditationAllowance DefMedAllowance{ get{ return ArmorMeditationAllowance.None; } } + public override ArmorMeditationAllowance DefMedAllowance => ArmorMeditationAllowance.None; [Constructible] public OrcHelm() : base( 0x1F0B ) @@ -34,13 +34,13 @@ namespace Server.Items public OrcHelm( Serial serial ) : base( serial ) { } - + public override void Serialize( GenericWriter writer ) { base.Serialize( writer ); writer.Write( (int) 1 ); } - + public override void Deserialize(GenericReader reader) { base.Deserialize( reader ); @@ -52,4 +52,4 @@ namespace Server.Items } } } -} \ No newline at end of file +} diff --git a/Scripts/Items/Armor/Helmets/PlateHelm.cs b/Scripts/Items/Armor/Helmets/PlateHelm.cs index af9f3fd97..15e45b603 100644 --- a/Scripts/Items/Armor/Helmets/PlateHelm.cs +++ b/Scripts/Items/Armor/Helmets/PlateHelm.cs @@ -5,23 +5,23 @@ namespace Server.Items { public class PlateHelm : BaseArmor { - public override int BasePhysicalResistance{ get{ return 5; } } - public override int BaseFireResistance{ get{ return 3; } } - public override int BaseColdResistance{ get{ return 2; } } - public override int BasePoisonResistance{ get{ return 3; } } - public override int BaseEnergyResistance{ get{ return 2; } } + public override int BasePhysicalResistance => 5; + public override int BaseFireResistance => 3; + public override int BaseColdResistance => 2; + public override int BasePoisonResistance => 3; + public override int BaseEnergyResistance => 2; - public override int InitMinHits{ get{ return 50; } } - public override int InitMaxHits{ get{ return 65; } } + public override int InitMinHits => 50; + public override int InitMaxHits => 65; - public override int AosStrReq{ get{ return 80; } } - public override int OldStrReq{ get{ return 40; } } + public override int AosStrReq => 80; + public override int OldStrReq => 40; - public override int OldDexBonus{ get{ return -1; } } + public override int OldDexBonus => -1; - public override int ArmorBase{ get{ return 40; } } + public override int ArmorBase => 40; - public override ArmorMaterialType MaterialType{ get{ return ArmorMaterialType.Plate; } } + public override ArmorMaterialType MaterialType => ArmorMaterialType.Plate; [Constructible] public PlateHelm() : base( 0x1412 ) @@ -32,13 +32,13 @@ namespace Server.Items public PlateHelm( Serial serial ) : base( serial ) { } - + public override void Serialize( GenericWriter writer ) { base.Serialize( writer ); writer.Write( (int) 0 ); } - + public override void Deserialize(GenericReader reader) { base.Deserialize( reader ); @@ -48,4 +48,4 @@ namespace Server.Items Weight = 5.0; } } -} \ No newline at end of file +} diff --git a/Scripts/Items/Armor/Helmets/RavenHelm.cs b/Scripts/Items/Armor/Helmets/RavenHelm.cs index 1a464faf6..1cc2f9f88 100644 --- a/Scripts/Items/Armor/Helmets/RavenHelm.cs +++ b/Scripts/Items/Armor/Helmets/RavenHelm.cs @@ -6,23 +6,23 @@ namespace Server.Items [FlippableAttribute( 0x2B71, 0x3168 )] public class RavenHelm : BaseArmor { - public override Race RequiredRace { get { return Race.Elf; } } + public override Race RequiredRace => Race.Elf; - public override int BasePhysicalResistance{ get{ return 5; } } - public override int BaseFireResistance{ get{ return 1; } } - public override int BaseColdResistance{ get{ return 2; } } - public override int BasePoisonResistance{ get{ return 2; } } - public override int BaseEnergyResistance{ get{ return 5; } } + public override int BasePhysicalResistance => 5; + public override int BaseFireResistance => 1; + public override int BaseColdResistance => 2; + public override int BasePoisonResistance => 2; + public override int BaseEnergyResistance => 5; - public override int InitMinHits{ get{ return 50; } } - public override int InitMaxHits{ get{ return 65; } } + public override int InitMinHits => 50; + public override int InitMaxHits => 65; - public override int AosStrReq{ get{ return 25; } } - public override int OldStrReq{ get{ return 25; } } + public override int AosStrReq => 25; + public override int OldStrReq => 25; - public override int ArmorBase{ get{ return 40; } } + public override int ArmorBase => 40; - public override ArmorMaterialType MaterialType{ get{ return ArmorMaterialType.Plate; } } + public override ArmorMaterialType MaterialType => ArmorMaterialType.Plate; [Constructible] public RavenHelm() : base( 0x2B71 ) @@ -33,14 +33,14 @@ namespace Server.Items public RavenHelm( Serial serial ) : base( serial ) { } - + public override void Serialize( GenericWriter writer ) { base.Serialize( writer ); writer.WriteEncodedInt( 0 ); } - + public override void Deserialize(GenericReader reader) { base.Deserialize( reader ); @@ -48,4 +48,4 @@ namespace Server.Items int version = reader.ReadEncodedInt(); } } -} \ No newline at end of file +} diff --git a/Scripts/Items/Armor/Helmets/RoyalCirclet.cs b/Scripts/Items/Armor/Helmets/RoyalCirclet.cs index 4b9b1c83d..783ebe9bd 100644 --- a/Scripts/Items/Armor/Helmets/RoyalCirclet.cs +++ b/Scripts/Items/Armor/Helmets/RoyalCirclet.cs @@ -6,25 +6,25 @@ namespace Server.Items [FlippableAttribute( 0x2B6F, 0x3166 )] public class RoyalCirclet : BaseArmor { - public override Race RequiredRace { get { return Race.Elf; } } + public override Race RequiredRace => Race.Elf; - public override int BasePhysicalResistance{ get{ return 1; } } - public override int BaseFireResistance{ get{ return 5; } } - public override int BaseColdResistance{ get{ return 2; } } - public override int BasePoisonResistance{ get{ return 2; } } - public override int BaseEnergyResistance{ get{ return 5; } } + public override int BasePhysicalResistance => 1; + public override int BaseFireResistance => 5; + public override int BaseColdResistance => 2; + public override int BasePoisonResistance => 2; + public override int BaseEnergyResistance => 5; - public override int InitMinHits{ get{ return 20; } } - public override int InitMaxHits{ get{ return 35; } } + public override int InitMinHits => 20; + public override int InitMaxHits => 35; - public override int AosStrReq{ get{ return 10; } } - public override int OldStrReq{ get{ return 10; } } + public override int AosStrReq => 10; + public override int OldStrReq => 10; - public override int ArmorBase{ get{ return 30; } } + public override int ArmorBase => 30; - public override ArmorMaterialType MaterialType{ get{ return ArmorMaterialType.Plate; } } + public override ArmorMaterialType MaterialType => ArmorMaterialType.Plate; - public override ArmorMeditationAllowance DefMedAllowance{ get{ return ArmorMeditationAllowance.All; } } + public override ArmorMeditationAllowance DefMedAllowance => ArmorMeditationAllowance.All; [Constructible] public RoyalCirclet() : base( 0x2B6F ) @@ -50,4 +50,4 @@ namespace Server.Items int version = reader.ReadEncodedInt(); } } -} \ No newline at end of file +} diff --git a/Scripts/Items/Armor/Helmets/VultureHelm.cs b/Scripts/Items/Armor/Helmets/VultureHelm.cs index 96ecbc71d..01c4ee80a 100644 --- a/Scripts/Items/Armor/Helmets/VultureHelm.cs +++ b/Scripts/Items/Armor/Helmets/VultureHelm.cs @@ -6,23 +6,23 @@ namespace Server.Items [FlippableAttribute( 0x2B72, 0x3169 )] public class VultureHelm : BaseArmor { - public override Race RequiredRace { get { return Race.Elf; } } + public override Race RequiredRace => Race.Elf; - public override int BasePhysicalResistance{ get{ return 5; } } - public override int BaseFireResistance{ get{ return 1; } } - public override int BaseColdResistance{ get{ return 2; } } - public override int BasePoisonResistance{ get{ return 2; } } - public override int BaseEnergyResistance{ get{ return 5; } } + public override int BasePhysicalResistance => 5; + public override int BaseFireResistance => 1; + public override int BaseColdResistance => 2; + public override int BasePoisonResistance => 2; + public override int BaseEnergyResistance => 5; - public override int InitMinHits{ get{ return 50; } } - public override int InitMaxHits{ get{ return 65; } } + public override int InitMinHits => 50; + public override int InitMaxHits => 65; - public override int AosStrReq{ get{ return 25; } } - public override int OldStrReq{ get{ return 25; } } + public override int AosStrReq => 25; + public override int OldStrReq => 25; - public override int ArmorBase{ get{ return 40; } } + public override int ArmorBase => 40; - public override ArmorMaterialType MaterialType{ get{ return ArmorMaterialType.Plate; } } + public override ArmorMaterialType MaterialType => ArmorMaterialType.Plate; [Constructible] public VultureHelm() : base( 0x2B72 ) @@ -33,14 +33,14 @@ namespace Server.Items public VultureHelm( Serial serial ) : base( serial ) { } - + public override void Serialize( GenericWriter writer ) { base.Serialize( writer ); writer.WriteEncodedInt( 0 ); } - + public override void Deserialize(GenericReader reader) { base.Deserialize( reader ); @@ -48,4 +48,4 @@ namespace Server.Items int version = reader.ReadEncodedInt(); } } -} \ No newline at end of file +} diff --git a/Scripts/Items/Armor/Helmets/WingedHelm.cs b/Scripts/Items/Armor/Helmets/WingedHelm.cs index b3217689d..4a523f924 100644 --- a/Scripts/Items/Armor/Helmets/WingedHelm.cs +++ b/Scripts/Items/Armor/Helmets/WingedHelm.cs @@ -6,23 +6,23 @@ namespace Server.Items [FlippableAttribute( 0x2B73, 0x316A )] public class WingedHelm : BaseArmor { - public override Race RequiredRace { get { return Race.Elf; } } + public override Race RequiredRace => Race.Elf; - public override int BasePhysicalResistance{ get{ return 5; } } - public override int BaseFireResistance{ get{ return 1; } } - public override int BaseColdResistance{ get{ return 2; } } - public override int BasePoisonResistance{ get{ return 2; } } - public override int BaseEnergyResistance{ get{ return 5; } } + public override int BasePhysicalResistance => 5; + public override int BaseFireResistance => 1; + public override int BaseColdResistance => 2; + public override int BasePoisonResistance => 2; + public override int BaseEnergyResistance => 5; - public override int InitMinHits{ get{ return 45; } } - public override int InitMaxHits{ get{ return 55; } } + public override int InitMinHits => 45; + public override int InitMaxHits => 55; - public override int AosStrReq{ get{ return 25; } } - public override int OldStrReq{ get{ return 25; } } + public override int AosStrReq => 25; + public override int OldStrReq => 25; - public override int ArmorBase{ get{ return 40; } } + public override int ArmorBase => 40; - public override ArmorMaterialType MaterialType{ get{ return ArmorMaterialType.Plate; } } + public override ArmorMaterialType MaterialType => ArmorMaterialType.Plate; [Constructible] public WingedHelm() : base( 0x2B73 ) @@ -33,14 +33,14 @@ namespace Server.Items public WingedHelm( Serial serial ) : base( serial ) { } - + public override void Serialize( GenericWriter writer ) { base.Serialize( writer ); writer.WriteEncodedInt( 0 ); } - + public override void Deserialize(GenericReader reader) { base.Deserialize( reader ); @@ -48,4 +48,4 @@ namespace Server.Items int version = reader.ReadEncodedInt(); } } -} \ No newline at end of file +} diff --git a/Scripts/Items/Armor/Leather/FemaleLeafChest.cs b/Scripts/Items/Armor/Leather/FemaleLeafChest.cs index c5436e6fa..3711be078 100644 --- a/Scripts/Items/Armor/Leather/FemaleLeafChest.cs +++ b/Scripts/Items/Armor/Leather/FemaleLeafChest.cs @@ -6,24 +6,24 @@ namespace Server.Items [FlippableAttribute( 0x2FCB, 0x3181 )] public class FemaleLeafChest : BaseArmor { - public override int BasePhysicalResistance{ get{ return 2; } } - public override int BaseFireResistance{ get{ return 3; } } - public override int BaseColdResistance{ get{ return 2; } } - public override int BasePoisonResistance{ get{ return 4; } } - public override int BaseEnergyResistance{ get{ return 4; } } + public override int BasePhysicalResistance => 2; + public override int BaseFireResistance => 3; + public override int BaseColdResistance => 2; + public override int BasePoisonResistance => 4; + public override int BaseEnergyResistance => 4; - public override int InitMinHits{ get{ return 30; } } - public override int InitMaxHits{ get{ return 40; } } + public override int InitMinHits => 30; + public override int InitMaxHits => 40; - public override int AosStrReq{ get{ return 20; } } - public override int OldStrReq{ get{ return 20; } } + public override int AosStrReq => 20; + public override int OldStrReq => 20; - public override int ArmorBase{ get{ return 13; } } + public override int ArmorBase => 13; - public override ArmorMaterialType MaterialType{ get{ return ArmorMaterialType.Leather; } } - public override CraftResource DefaultResource{ get{ return CraftResource.RegularLeather; } } + public override ArmorMaterialType MaterialType => ArmorMaterialType.Leather; + public override CraftResource DefaultResource => CraftResource.RegularLeather; - public override ArmorMeditationAllowance DefMedAllowance{ get{ return ArmorMeditationAllowance.All; } } + public override ArmorMeditationAllowance DefMedAllowance => ArmorMeditationAllowance.All; public override bool AllowMaleWearer => false; diff --git a/Scripts/Items/Armor/Leather/FemaleLeatherChest.cs b/Scripts/Items/Armor/Leather/FemaleLeatherChest.cs index 231b5ea59..fb51b1fc5 100644 --- a/Scripts/Items/Armor/Leather/FemaleLeatherChest.cs +++ b/Scripts/Items/Armor/Leather/FemaleLeatherChest.cs @@ -6,24 +6,24 @@ namespace Server.Items [FlippableAttribute( 0x1c06, 0x1c07 )] public class FemaleLeatherChest : BaseArmor { - public override int BasePhysicalResistance{ get{ return 2; } } - public override int BaseFireResistance{ get{ return 4; } } - public override int BaseColdResistance{ get{ return 3; } } - public override int BasePoisonResistance{ get{ return 3; } } - public override int BaseEnergyResistance{ get{ return 3; } } + public override int BasePhysicalResistance => 2; + public override int BaseFireResistance => 4; + public override int BaseColdResistance => 3; + public override int BasePoisonResistance => 3; + public override int BaseEnergyResistance => 3; - public override int InitMinHits{ get{ return 30; } } - public override int InitMaxHits{ get{ return 40; } } + public override int InitMinHits => 30; + public override int InitMaxHits => 40; - public override int AosStrReq{ get{ return 25; } } - public override int OldStrReq{ get{ return 15; } } + public override int AosStrReq => 25; + public override int OldStrReq => 15; - public override int ArmorBase{ get{ return 13; } } + public override int ArmorBase => 13; - public override ArmorMaterialType MaterialType{ get{ return ArmorMaterialType.Leather; } } - public override CraftResource DefaultResource{ get{ return CraftResource.RegularLeather; } } + public override ArmorMaterialType MaterialType => ArmorMaterialType.Leather; + public override CraftResource DefaultResource => CraftResource.RegularLeather; - public override ArmorMeditationAllowance DefMedAllowance{ get{ return ArmorMeditationAllowance.All; } } + public override ArmorMeditationAllowance DefMedAllowance => ArmorMeditationAllowance.All; public override bool AllowMaleWearer => false; diff --git a/Scripts/Items/Armor/Leather/LeafArms.cs b/Scripts/Items/Armor/Leather/LeafArms.cs index 80c2934a7..9b873fcb2 100644 --- a/Scripts/Items/Armor/Leather/LeafArms.cs +++ b/Scripts/Items/Armor/Leather/LeafArms.cs @@ -6,25 +6,25 @@ namespace Server.Items [FlippableAttribute( 0x2FC8, 0x317E )] public class LeafArms : BaseArmor { - public override Race RequiredRace { get { return Race.Elf; } } - public override int BasePhysicalResistance{ get{ return 2; } } - public override int BaseFireResistance{ get{ return 3; } } - public override int BaseColdResistance{ get{ return 2; } } - public override int BasePoisonResistance{ get{ return 4; } } - public override int BaseEnergyResistance{ get{ return 4; } } + public override Race RequiredRace => Race.Elf; + public override int BasePhysicalResistance => 2; + public override int BaseFireResistance => 3; + public override int BaseColdResistance => 2; + public override int BasePoisonResistance => 4; + public override int BaseEnergyResistance => 4; - public override int InitMinHits{ get{ return 30; } } - public override int InitMaxHits{ get{ return 40; } } + public override int InitMinHits => 30; + public override int InitMaxHits => 40; - public override int AosStrReq{ get{ return 15; } } - public override int OldStrReq{ get{ return 15; } } + public override int AosStrReq => 15; + public override int OldStrReq => 15; - public override int ArmorBase{ get{ return 13; } } + public override int ArmorBase => 13; - public override ArmorMaterialType MaterialType{ get{ return ArmorMaterialType.Leather; } } - public override CraftResource DefaultResource{ get{ return CraftResource.RegularLeather; } } + public override ArmorMaterialType MaterialType => ArmorMaterialType.Leather; + public override CraftResource DefaultResource => CraftResource.RegularLeather; - public override ArmorMeditationAllowance DefMedAllowance{ get{ return ArmorMeditationAllowance.All; } } + public override ArmorMeditationAllowance DefMedAllowance => ArmorMeditationAllowance.All; [Constructible] public LeafArms() : base( 0x2FC8 ) @@ -50,4 +50,4 @@ namespace Server.Items int version = reader.ReadEncodedInt(); } } -} \ No newline at end of file +} diff --git a/Scripts/Items/Armor/Leather/LeafChest.cs b/Scripts/Items/Armor/Leather/LeafChest.cs index 23914874b..a1f971f28 100644 --- a/Scripts/Items/Armor/Leather/LeafChest.cs +++ b/Scripts/Items/Armor/Leather/LeafChest.cs @@ -6,25 +6,25 @@ namespace Server.Items [FlippableAttribute( 0x2FC5, 0x317B )] public class LeafChest : BaseArmor { - public override Race RequiredRace { get { return Race.Elf; } } - public override int BasePhysicalResistance{ get{ return 2; } } - public override int BaseFireResistance{ get{ return 3; } } - public override int BaseColdResistance{ get{ return 2; } } - public override int BasePoisonResistance{ get{ return 4; } } - public override int BaseEnergyResistance{ get{ return 4; } } + public override Race RequiredRace => Race.Elf; + public override int BasePhysicalResistance => 2; + public override int BaseFireResistance => 3; + public override int BaseColdResistance => 2; + public override int BasePoisonResistance => 4; + public override int BaseEnergyResistance => 4; - public override int InitMinHits{ get{ return 30; } } - public override int InitMaxHits{ get{ return 40; } } + public override int InitMinHits => 30; + public override int InitMaxHits => 40; - public override int AosStrReq{ get{ return 20; } } - public override int OldStrReq{ get{ return 20; } } + public override int AosStrReq => 20; + public override int OldStrReq => 20; - public override int ArmorBase{ get{ return 13; } } + public override int ArmorBase => 13; - public override ArmorMaterialType MaterialType{ get{ return ArmorMaterialType.Leather; } } - public override CraftResource DefaultResource{ get{ return CraftResource.RegularLeather; } } + public override ArmorMaterialType MaterialType => ArmorMaterialType.Leather; + public override CraftResource DefaultResource => CraftResource.RegularLeather; - public override ArmorMeditationAllowance DefMedAllowance{ get{ return ArmorMeditationAllowance.All; } } + public override ArmorMeditationAllowance DefMedAllowance => ArmorMeditationAllowance.All; [Constructible] public LeafChest() : base( 0x2FC5 ) @@ -50,4 +50,4 @@ namespace Server.Items int version = reader.ReadEncodedInt(); } } -} \ No newline at end of file +} diff --git a/Scripts/Items/Armor/Leather/LeafGloves.cs b/Scripts/Items/Armor/Leather/LeafGloves.cs index 4275608ae..34c6e2bc2 100644 --- a/Scripts/Items/Armor/Leather/LeafGloves.cs +++ b/Scripts/Items/Armor/Leather/LeafGloves.cs @@ -6,25 +6,25 @@ namespace Server.Items [Flippable] public class LeafGloves : BaseArmor, IArcaneEquip { - public override Race RequiredRace { get { return Race.Elf; } } - public override int BasePhysicalResistance{ get{ return 2; } } - public override int BaseFireResistance{ get{ return 3; } } - public override int BaseColdResistance{ get{ return 2; } } - public override int BasePoisonResistance{ get{ return 4; } } - public override int BaseEnergyResistance{ get{ return 4; } } + public override Race RequiredRace => Race.Elf; + public override int BasePhysicalResistance => 2; + public override int BaseFireResistance => 3; + public override int BaseColdResistance => 2; + public override int BasePoisonResistance => 4; + public override int BaseEnergyResistance => 4; - public override int InitMinHits{ get{ return 30; } } - public override int InitMaxHits{ get{ return 40; } } + public override int InitMinHits => 30; + public override int InitMaxHits => 40; - public override int AosStrReq{ get{ return 10; } } - public override int OldStrReq{ get{ return 10; } } + public override int AosStrReq => 10; + public override int OldStrReq => 10; - public override int ArmorBase{ get{ return 13; } } + public override int ArmorBase => 13; - public override ArmorMaterialType MaterialType{ get{ return ArmorMaterialType.Leather; } } - public override CraftResource DefaultResource{ get{ return CraftResource.RegularLeather; } } + public override ArmorMaterialType MaterialType => ArmorMaterialType.Leather; + public override CraftResource DefaultResource => CraftResource.RegularLeather; - public override ArmorMeditationAllowance DefMedAllowance{ get{ return ArmorMeditationAllowance.All; } } + public override ArmorMeditationAllowance DefMedAllowance => ArmorMeditationAllowance.All; [Constructible] public LeafGloves() : base( 0x2FC6 ) @@ -137,4 +137,4 @@ namespace Server.Items } #endregion } -} \ No newline at end of file +} diff --git a/Scripts/Items/Armor/Leather/LeafGorget.cs b/Scripts/Items/Armor/Leather/LeafGorget.cs index 527e78d51..659a32ed0 100644 --- a/Scripts/Items/Armor/Leather/LeafGorget.cs +++ b/Scripts/Items/Armor/Leather/LeafGorget.cs @@ -5,25 +5,25 @@ namespace Server.Items { public class LeafGorget : BaseArmor { - public override Race RequiredRace { get { return Race.Elf; } } - public override int BasePhysicalResistance{ get{ return 2; } } - public override int BaseFireResistance{ get{ return 3; } } - public override int BaseColdResistance{ get{ return 2; } } - public override int BasePoisonResistance{ get{ return 4; } } - public override int BaseEnergyResistance{ get{ return 4; } } + public override Race RequiredRace => Race.Elf; + public override int BasePhysicalResistance => 2; + public override int BaseFireResistance => 3; + public override int BaseColdResistance => 2; + public override int BasePoisonResistance => 4; + public override int BaseEnergyResistance => 4; - public override int InitMinHits{ get{ return 30; } } - public override int InitMaxHits{ get{ return 40; } } + public override int InitMinHits => 30; + public override int InitMaxHits => 40; - public override int AosStrReq{ get{ return 10; } } - public override int OldStrReq{ get{ return 10; } } + public override int AosStrReq => 10; + public override int OldStrReq => 10; - public override int ArmorBase{ get{ return 13; } } + public override int ArmorBase => 13; - public override ArmorMaterialType MaterialType{ get{ return ArmorMaterialType.Leather; } } - public override CraftResource DefaultResource{ get{ return CraftResource.RegularLeather; } } + public override ArmorMaterialType MaterialType => ArmorMaterialType.Leather; + public override CraftResource DefaultResource => CraftResource.RegularLeather; - public override ArmorMeditationAllowance DefMedAllowance{ get{ return ArmorMeditationAllowance.All; } } + public override ArmorMeditationAllowance DefMedAllowance => ArmorMeditationAllowance.All; [Constructible] public LeafGorget() : base( 0x2FC7 ) @@ -49,4 +49,4 @@ namespace Server.Items int version = reader.ReadEncodedInt(); } } -} \ No newline at end of file +} diff --git a/Scripts/Items/Armor/Leather/LeafLegs.cs b/Scripts/Items/Armor/Leather/LeafLegs.cs index 51557558a..e73ca09fe 100644 --- a/Scripts/Items/Armor/Leather/LeafLegs.cs +++ b/Scripts/Items/Armor/Leather/LeafLegs.cs @@ -6,26 +6,26 @@ namespace Server.Items [FlippableAttribute( 0x2FC9, 0x317F )] public class LeafLegs : BaseArmor { - public override Race RequiredRace { get { return Race.Elf; } } + public override Race RequiredRace => Race.Elf; - public override int BasePhysicalResistance{ get{ return 2; } } - public override int BaseFireResistance{ get{ return 3; } } - public override int BaseColdResistance{ get{ return 2; } } - public override int BasePoisonResistance{ get{ return 4; } } - public override int BaseEnergyResistance{ get{ return 4; } } + public override int BasePhysicalResistance => 2; + public override int BaseFireResistance => 3; + public override int BaseColdResistance => 2; + public override int BasePoisonResistance => 4; + public override int BaseEnergyResistance => 4; - public override int InitMinHits{ get{ return 30; } } - public override int InitMaxHits{ get{ return 40; } } + public override int InitMinHits => 30; + public override int InitMaxHits => 40; - public override int AosStrReq{ get{ return 20; } } - public override int OldStrReq{ get{ return 20; } } + public override int AosStrReq => 20; + public override int OldStrReq => 20; - public override int ArmorBase{ get{ return 13; } } + public override int ArmorBase => 13; - public override ArmorMaterialType MaterialType{ get{ return ArmorMaterialType.Leather; } } - public override CraftResource DefaultResource{ get{ return CraftResource.RegularLeather; } } + public override ArmorMaterialType MaterialType => ArmorMaterialType.Leather; + public override CraftResource DefaultResource => CraftResource.RegularLeather; - public override ArmorMeditationAllowance DefMedAllowance{ get{ return ArmorMeditationAllowance.All; } } + public override ArmorMeditationAllowance DefMedAllowance => ArmorMeditationAllowance.All; [Constructible] public LeafLegs() : base( 0x2FC9 ) @@ -51,4 +51,4 @@ namespace Server.Items int version = reader.ReadEncodedInt(); } } -} \ No newline at end of file +} diff --git a/Scripts/Items/Armor/Leather/LeafTonlet.cs b/Scripts/Items/Armor/Leather/LeafTonlet.cs index c47baf570..0560a2144 100644 --- a/Scripts/Items/Armor/Leather/LeafTonlet.cs +++ b/Scripts/Items/Armor/Leather/LeafTonlet.cs @@ -6,25 +6,25 @@ namespace Server.Items [FlippableAttribute( 0x2FCA, 0x3180 )] public class LeafTonlet : BaseArmor { - public override Race RequiredRace { get { return Race.Elf; } } - public override int BasePhysicalResistance{ get{ return 2; } } - public override int BaseFireResistance{ get{ return 3; } } - public override int BaseColdResistance{ get{ return 2; } } - public override int BasePoisonResistance{ get{ return 4; } } - public override int BaseEnergyResistance{ get{ return 4; } } + public override Race RequiredRace => Race.Elf; + public override int BasePhysicalResistance => 2; + public override int BaseFireResistance => 3; + public override int BaseColdResistance => 2; + public override int BasePoisonResistance => 4; + public override int BaseEnergyResistance => 4; - public override int InitMinHits{ get{ return 30; } } - public override int InitMaxHits{ get{ return 40; } } + public override int InitMinHits => 30; + public override int InitMaxHits => 40; - public override int AosStrReq{ get{ return 10; } } - public override int OldStrReq{ get{ return 10; } } + public override int AosStrReq => 10; + public override int OldStrReq => 10; - public override int ArmorBase{ get{ return 13; } } + public override int ArmorBase => 13; - public override ArmorMaterialType MaterialType{ get{ return ArmorMaterialType.Leather; } } - public override CraftResource DefaultResource{ get{ return CraftResource.RegularLeather; } } + public override ArmorMaterialType MaterialType => ArmorMaterialType.Leather; + public override CraftResource DefaultResource => CraftResource.RegularLeather; - public override ArmorMeditationAllowance DefMedAllowance{ get{ return ArmorMeditationAllowance.All; } } + public override ArmorMeditationAllowance DefMedAllowance => ArmorMeditationAllowance.All; [Constructible] public LeafTonlet() : base( 0x2FCA ) @@ -50,4 +50,4 @@ namespace Server.Items int version = reader.ReadEncodedInt(); } } -} \ No newline at end of file +} diff --git a/Scripts/Items/Armor/Leather/LeatherArms.cs b/Scripts/Items/Armor/Leather/LeatherArms.cs index 61f5c637a..e5142b4d2 100644 --- a/Scripts/Items/Armor/Leather/LeatherArms.cs +++ b/Scripts/Items/Armor/Leather/LeatherArms.cs @@ -6,24 +6,24 @@ namespace Server.Items [FlippableAttribute( 0x13cd, 0x13c5 )] public class LeatherArms : BaseArmor { - public override int BasePhysicalResistance{ get{ return 2; } } - public override int BaseFireResistance{ get{ return 4; } } - public override int BaseColdResistance{ get{ return 3; } } - public override int BasePoisonResistance{ get{ return 3; } } - public override int BaseEnergyResistance{ get{ return 3; } } + public override int BasePhysicalResistance => 2; + public override int BaseFireResistance => 4; + public override int BaseColdResistance => 3; + public override int BasePoisonResistance => 3; + public override int BaseEnergyResistance => 3; - public override int InitMinHits{ get{ return 30; } } - public override int InitMaxHits{ get{ return 40; } } + public override int InitMinHits => 30; + public override int InitMaxHits => 40; - public override int AosStrReq{ get{ return 20; } } - public override int OldStrReq{ get{ return 15; } } + public override int AosStrReq => 20; + public override int OldStrReq => 15; - public override int ArmorBase{ get{ return 13; } } + public override int ArmorBase => 13; - public override ArmorMaterialType MaterialType{ get{ return ArmorMaterialType.Leather; } } - public override CraftResource DefaultResource{ get{ return CraftResource.RegularLeather; } } + public override ArmorMaterialType MaterialType => ArmorMaterialType.Leather; + public override CraftResource DefaultResource => CraftResource.RegularLeather; - public override ArmorMeditationAllowance DefMedAllowance{ get{ return ArmorMeditationAllowance.All; } } + public override ArmorMeditationAllowance DefMedAllowance => ArmorMeditationAllowance.All; [Constructible] public LeatherArms() : base( 0x13CD ) @@ -34,13 +34,13 @@ namespace Server.Items public LeatherArms( Serial serial ) : base( serial ) { } - + public override void Serialize( GenericWriter writer ) { base.Serialize( writer ); writer.Write( (int) 0 ); } - + public override void Deserialize(GenericReader reader) { base.Deserialize( reader ); @@ -50,4 +50,4 @@ namespace Server.Items Weight = 2.0; } } -} \ No newline at end of file +} diff --git a/Scripts/Items/Armor/Leather/LeatherBustierArms.cs b/Scripts/Items/Armor/Leather/LeatherBustierArms.cs index 98c764448..a35502af8 100644 --- a/Scripts/Items/Armor/Leather/LeatherBustierArms.cs +++ b/Scripts/Items/Armor/Leather/LeatherBustierArms.cs @@ -6,24 +6,24 @@ namespace Server.Items [FlippableAttribute( 0x1c0a, 0x1c0b )] public class LeatherBustierArms : BaseArmor { - public override int BasePhysicalResistance{ get{ return 2; } } - public override int BaseFireResistance{ get{ return 4; } } - public override int BaseColdResistance{ get{ return 3; } } - public override int BasePoisonResistance{ get{ return 3; } } - public override int BaseEnergyResistance{ get{ return 3; } } + public override int BasePhysicalResistance => 2; + public override int BaseFireResistance => 4; + public override int BaseColdResistance => 3; + public override int BasePoisonResistance => 3; + public override int BaseEnergyResistance => 3; - public override int InitMinHits{ get{ return 30; } } - public override int InitMaxHits{ get{ return 40; } } + public override int InitMinHits => 30; + public override int InitMaxHits => 40; - public override int AosStrReq{ get{ return 20; } } - public override int OldStrReq{ get{ return 15; } } + public override int AosStrReq => 20; + public override int OldStrReq => 15; - public override int ArmorBase{ get{ return 13; } } + public override int ArmorBase => 13; - public override ArmorMaterialType MaterialType{ get{ return ArmorMaterialType.Leather; } } - public override CraftResource DefaultResource{ get{ return CraftResource.RegularLeather; } } + public override ArmorMaterialType MaterialType => ArmorMaterialType.Leather; + public override CraftResource DefaultResource => CraftResource.RegularLeather; - public override ArmorMeditationAllowance DefMedAllowance{ get{ return ArmorMeditationAllowance.All; } } + public override ArmorMeditationAllowance DefMedAllowance => ArmorMeditationAllowance.All; public override bool AllowMaleWearer => false; diff --git a/Scripts/Items/Armor/Leather/LeatherChest.cs b/Scripts/Items/Armor/Leather/LeatherChest.cs index 1a3b93bb2..5e2915fcc 100644 --- a/Scripts/Items/Armor/Leather/LeatherChest.cs +++ b/Scripts/Items/Armor/Leather/LeatherChest.cs @@ -6,24 +6,24 @@ namespace Server.Items [FlippableAttribute( 0x13cc, 0x13d3 )] public class LeatherChest : BaseArmor { - public override int BasePhysicalResistance{ get{ return 2; } } - public override int BaseFireResistance{ get{ return 4; } } - public override int BaseColdResistance{ get{ return 3; } } - public override int BasePoisonResistance{ get{ return 3; } } - public override int BaseEnergyResistance{ get{ return 3; } } + public override int BasePhysicalResistance => 2; + public override int BaseFireResistance => 4; + public override int BaseColdResistance => 3; + public override int BasePoisonResistance => 3; + public override int BaseEnergyResistance => 3; - public override int InitMinHits{ get{ return 30; } } - public override int InitMaxHits{ get{ return 40; } } + public override int InitMinHits => 30; + public override int InitMaxHits => 40; - public override int AosStrReq{ get{ return 25; } } - public override int OldStrReq{ get{ return 15; } } + public override int AosStrReq => 25; + public override int OldStrReq => 15; - public override int ArmorBase{ get{ return 13; } } + public override int ArmorBase => 13; - public override ArmorMaterialType MaterialType{ get{ return ArmorMaterialType.Leather; } } - public override CraftResource DefaultResource{ get{ return CraftResource.RegularLeather; } } + public override ArmorMaterialType MaterialType => ArmorMaterialType.Leather; + public override CraftResource DefaultResource => CraftResource.RegularLeather; - public override ArmorMeditationAllowance DefMedAllowance{ get{ return ArmorMeditationAllowance.All; } } + public override ArmorMeditationAllowance DefMedAllowance => ArmorMeditationAllowance.All; [Constructible] public LeatherChest() : base( 0x13CC ) @@ -34,13 +34,13 @@ namespace Server.Items public LeatherChest( Serial serial ) : base( serial ) { } - + public override void Serialize( GenericWriter writer ) { base.Serialize( writer ); writer.Write( (int) 0 ); } - + public override void Deserialize(GenericReader reader) { base.Deserialize( reader ); @@ -50,4 +50,4 @@ namespace Server.Items Weight = 6.0; } } -} \ No newline at end of file +} diff --git a/Scripts/Items/Armor/Leather/LeatherDo.cs b/Scripts/Items/Armor/Leather/LeatherDo.cs index 6c9eca915..da693a1c0 100644 --- a/Scripts/Items/Armor/Leather/LeatherDo.cs +++ b/Scripts/Items/Armor/Leather/LeatherDo.cs @@ -5,24 +5,24 @@ namespace Server.Items { public class LeatherDo : BaseArmor { - public override int BasePhysicalResistance{ get{ return 2; } } - public override int BaseFireResistance{ get{ return 4; } } - public override int BaseColdResistance{ get{ return 3; } } - public override int BasePoisonResistance{ get{ return 3; } } - public override int BaseEnergyResistance{ get{ return 3; } } + public override int BasePhysicalResistance => 2; + public override int BaseFireResistance => 4; + public override int BaseColdResistance => 3; + public override int BasePoisonResistance => 3; + public override int BaseEnergyResistance => 3; - public override int InitMinHits{ get{ return 35; } } - public override int InitMaxHits{ get{ return 45; } } + public override int InitMinHits => 35; + public override int InitMaxHits => 45; - public override int AosStrReq{ get{ return 40; } } - public override int OldStrReq{ get{ return 40; } } + public override int AosStrReq => 40; + public override int OldStrReq => 40; - public override int ArmorBase{ get{ return 3; } } + public override int ArmorBase => 3; - public override ArmorMaterialType MaterialType{ get{ return ArmorMaterialType.Leather; } } - public override CraftResource DefaultResource { get { return CraftResource.RegularLeather; } } + public override ArmorMaterialType MaterialType => ArmorMaterialType.Leather; + public override CraftResource DefaultResource => CraftResource.RegularLeather; - public override ArmorMeditationAllowance DefMedAllowance{ get{ return ArmorMeditationAllowance.All; } } + public override ArmorMeditationAllowance DefMedAllowance => ArmorMeditationAllowance.All; [Constructible] public LeatherDo() : base( 0x27C6 ) @@ -33,17 +33,17 @@ namespace Server.Items public LeatherDo( Serial serial ) : base( serial ) { } - + public override void Serialize( GenericWriter writer ) { base.Serialize( writer ); writer.Write( (int) 0 ); } - + public override void Deserialize( GenericReader reader ) { base.Deserialize( reader ); int version = reader.ReadInt(); } } -} \ No newline at end of file +} diff --git a/Scripts/Items/Armor/Leather/LeatherGloves.cs b/Scripts/Items/Armor/Leather/LeatherGloves.cs index bba4c009c..34ff59331 100644 --- a/Scripts/Items/Armor/Leather/LeatherGloves.cs +++ b/Scripts/Items/Armor/Leather/LeatherGloves.cs @@ -6,24 +6,24 @@ namespace Server.Items [Flippable] public class LeatherGloves : BaseArmor, IArcaneEquip { - public override int BasePhysicalResistance{ get{ return 2; } } - public override int BaseFireResistance{ get{ return 4; } } - public override int BaseColdResistance{ get{ return 3; } } - public override int BasePoisonResistance{ get{ return 3; } } - public override int BaseEnergyResistance{ get{ return 3; } } + public override int BasePhysicalResistance => 2; + public override int BaseFireResistance => 4; + public override int BaseColdResistance => 3; + public override int BasePoisonResistance => 3; + public override int BaseEnergyResistance => 3; - public override int InitMinHits{ get{ return 30; } } - public override int InitMaxHits{ get{ return 40; } } + public override int InitMinHits => 30; + public override int InitMaxHits => 40; - public override int AosStrReq{ get{ return 20; } } - public override int OldStrReq{ get{ return 10; } } + public override int AosStrReq => 20; + public override int OldStrReq => 10; - public override int ArmorBase{ get{ return 13; } } + public override int ArmorBase => 13; - public override ArmorMaterialType MaterialType{ get{ return ArmorMaterialType.Leather; } } - public override CraftResource DefaultResource{ get{ return CraftResource.RegularLeather; } } + public override ArmorMaterialType MaterialType => ArmorMaterialType.Leather; + public override CraftResource DefaultResource => CraftResource.RegularLeather; - public override ArmorMeditationAllowance DefMedAllowance{ get{ return ArmorMeditationAllowance.All; } } + public override ArmorMeditationAllowance DefMedAllowance => ArmorMeditationAllowance.All; [Constructible] public LeatherGloves() : base( 0x13C6 ) @@ -136,4 +136,4 @@ namespace Server.Items } #endregion } -} \ No newline at end of file +} diff --git a/Scripts/Items/Armor/Leather/LeatherGorget.cs b/Scripts/Items/Armor/Leather/LeatherGorget.cs index 49a4cb6aa..67e3c79dd 100644 --- a/Scripts/Items/Armor/Leather/LeatherGorget.cs +++ b/Scripts/Items/Armor/Leather/LeatherGorget.cs @@ -5,24 +5,24 @@ namespace Server.Items { public class LeatherGorget : BaseArmor { - public override int BasePhysicalResistance{ get{ return 2; } } - public override int BaseFireResistance{ get{ return 4; } } - public override int BaseColdResistance{ get{ return 3; } } - public override int BasePoisonResistance{ get{ return 3; } } - public override int BaseEnergyResistance{ get{ return 3; } } + public override int BasePhysicalResistance => 2; + public override int BaseFireResistance => 4; + public override int BaseColdResistance => 3; + public override int BasePoisonResistance => 3; + public override int BaseEnergyResistance => 3; - public override int InitMinHits{ get{ return 30; } } - public override int InitMaxHits{ get{ return 40; } } + public override int InitMinHits => 30; + public override int InitMaxHits => 40; - public override int AosStrReq{ get{ return 20; } } - public override int OldStrReq{ get{ return 10; } } + public override int AosStrReq => 20; + public override int OldStrReq => 10; - public override int ArmorBase{ get{ return 13; } } + public override int ArmorBase => 13; - public override ArmorMaterialType MaterialType{ get{ return ArmorMaterialType.Leather; } } - public override CraftResource DefaultResource{ get{ return CraftResource.RegularLeather; } } + public override ArmorMaterialType MaterialType => ArmorMaterialType.Leather; + public override CraftResource DefaultResource => CraftResource.RegularLeather; - public override ArmorMeditationAllowance DefMedAllowance{ get{ return ArmorMeditationAllowance.All; } } + public override ArmorMeditationAllowance DefMedAllowance => ArmorMeditationAllowance.All; [Constructible] public LeatherGorget() : base( 0x13C7 ) @@ -33,17 +33,17 @@ namespace Server.Items public LeatherGorget( Serial serial ) : base( serial ) { } - + public override void Serialize( GenericWriter writer ) { base.Serialize( writer ); writer.Write( (int) 0 ); } - + public override void Deserialize(GenericReader reader) { base.Deserialize( reader ); int version = reader.ReadInt(); } } -} \ No newline at end of file +} diff --git a/Scripts/Items/Armor/Leather/LeatherHaidate.cs b/Scripts/Items/Armor/Leather/LeatherHaidate.cs index 76896c437..515ca83d0 100644 --- a/Scripts/Items/Armor/Leather/LeatherHaidate.cs +++ b/Scripts/Items/Armor/Leather/LeatherHaidate.cs @@ -5,25 +5,25 @@ namespace Server.Items { public class LeatherHaidate : BaseArmor { - public override int BasePhysicalResistance{ get{ return 2; } } - public override int BaseFireResistance{ get{ return 4; } } - public override int BaseColdResistance{ get{ return 3; } } - public override int BasePoisonResistance{ get{ return 3; } } - public override int BaseEnergyResistance{ get{ return 3; } } + public override int BasePhysicalResistance => 2; + public override int BaseFireResistance => 4; + public override int BaseColdResistance => 3; + public override int BasePoisonResistance => 3; + public override int BaseEnergyResistance => 3; - public override int InitMinHits{ get{ return 30; } } - public override int InitMaxHits{ get{ return 40; } } + public override int InitMinHits => 30; + public override int InitMaxHits => 40; - public override int AosStrReq{ get{ return 20; } } - public override int OldStrReq{ get{ return 20; } } + public override int AosStrReq => 20; + public override int OldStrReq => 20; - public override int ArmorBase{ get{ return 3; } } + public override int ArmorBase => 3; - public override ArmorMaterialType MaterialType { get { return ArmorMaterialType.Leather; } } - public override CraftResource DefaultResource { get { return CraftResource.RegularLeather; } } + public override ArmorMaterialType MaterialType => ArmorMaterialType.Leather; + public override CraftResource DefaultResource => CraftResource.RegularLeather; - public override ArmorMeditationAllowance DefMedAllowance{ get{ return ArmorMeditationAllowance.All; } } + public override ArmorMeditationAllowance DefMedAllowance => ArmorMeditationAllowance.All; [Constructible] public LeatherHaidate() : base( 0x278A ) @@ -34,17 +34,17 @@ namespace Server.Items public LeatherHaidate( Serial serial ) : base( serial ) { } - + public override void Serialize( GenericWriter writer ) { base.Serialize( writer ); writer.Write( (int) 0 ); } - + public override void Deserialize( GenericReader reader ) { base.Deserialize( reader ); int version = reader.ReadInt(); } } -} \ No newline at end of file +} diff --git a/Scripts/Items/Armor/Leather/LeatherHiroSode.cs b/Scripts/Items/Armor/Leather/LeatherHiroSode.cs index 2b464691f..c17b6d920 100644 --- a/Scripts/Items/Armor/Leather/LeatherHiroSode.cs +++ b/Scripts/Items/Armor/Leather/LeatherHiroSode.cs @@ -5,24 +5,24 @@ namespace Server.Items { public class LeatherHiroSode : BaseArmor { - public override int BasePhysicalResistance{ get{ return 2; } } - public override int BaseFireResistance{ get{ return 4; } } - public override int BaseColdResistance{ get{ return 3; } } - public override int BasePoisonResistance{ get{ return 3; } } - public override int BaseEnergyResistance{ get{ return 3; } } + public override int BasePhysicalResistance => 2; + public override int BaseFireResistance => 4; + public override int BaseColdResistance => 3; + public override int BasePoisonResistance => 3; + public override int BaseEnergyResistance => 3; - public override int InitMinHits{ get{ return 40; } } - public override int InitMaxHits{ get{ return 50; } } + public override int InitMinHits => 40; + public override int InitMaxHits => 50; - public override int AosStrReq{ get{ return 25; } } - public override int OldStrReq{ get{ return 25; } } + public override int AosStrReq => 25; + public override int OldStrReq => 25; - public override int ArmorBase{ get{ return 3; } } + public override int ArmorBase => 3; - public override ArmorMaterialType MaterialType{ get{ return ArmorMaterialType.Leather; } } - public override CraftResource DefaultResource { get { return CraftResource.RegularLeather; } } + public override ArmorMaterialType MaterialType => ArmorMaterialType.Leather; + public override CraftResource DefaultResource => CraftResource.RegularLeather; - public override ArmorMeditationAllowance DefMedAllowance{ get{ return ArmorMeditationAllowance.All; } } + public override ArmorMeditationAllowance DefMedAllowance => ArmorMeditationAllowance.All; [Constructible] public LeatherHiroSode() : base( 0x277E ) @@ -33,17 +33,17 @@ namespace Server.Items public LeatherHiroSode( Serial serial ) : base( serial ) { } - + public override void Serialize( GenericWriter writer ) { base.Serialize( writer ); writer.Write( (int) 0 ); } - + public override void Deserialize( GenericReader reader ) { base.Deserialize( reader ); int version = reader.ReadInt(); } } -} \ No newline at end of file +} diff --git a/Scripts/Items/Armor/Leather/LeatherJingasa.cs b/Scripts/Items/Armor/Leather/LeatherJingasa.cs index 9b6b5fd83..0065955f1 100644 --- a/Scripts/Items/Armor/Leather/LeatherJingasa.cs +++ b/Scripts/Items/Armor/Leather/LeatherJingasa.cs @@ -5,24 +5,24 @@ namespace Server.Items { public class LeatherJingasa : BaseArmor { - public override int BasePhysicalResistance{ get{ return 4; } } - public override int BaseFireResistance{ get{ return 3; } } - public override int BaseColdResistance{ get{ return 3; } } - public override int BasePoisonResistance{ get{ return 2; } } - public override int BaseEnergyResistance{ get{ return 3; } } + public override int BasePhysicalResistance => 4; + public override int BaseFireResistance => 3; + public override int BaseColdResistance => 3; + public override int BasePoisonResistance => 2; + public override int BaseEnergyResistance => 3; - public override int InitMinHits{ get{ return 20; } } - public override int InitMaxHits{ get{ return 30; } } + public override int InitMinHits => 20; + public override int InitMaxHits => 30; - public override int AosStrReq{ get{ return 25; } } - public override int OldStrReq{ get{ return 25; } } + public override int AosStrReq => 25; + public override int OldStrReq => 25; - public override int ArmorBase{ get{ return 3; } } + public override int ArmorBase => 3; - public override ArmorMaterialType MaterialType{ get{ return ArmorMaterialType.Leather; } } - public override CraftResource DefaultResource { get { return CraftResource.RegularLeather; } } + public override ArmorMaterialType MaterialType => ArmorMaterialType.Leather; + public override CraftResource DefaultResource => CraftResource.RegularLeather; - public override ArmorMeditationAllowance DefMedAllowance{ get{ return ArmorMeditationAllowance.All; } } + public override ArmorMeditationAllowance DefMedAllowance => ArmorMeditationAllowance.All; [Constructible] public LeatherJingasa() : base( 0x2776 ) @@ -33,17 +33,17 @@ namespace Server.Items public LeatherJingasa( Serial serial ) : base( serial ) { } - + public override void Serialize( GenericWriter writer ) { base.Serialize( writer ); writer.Write( (int) 0 ); } - + public override void Deserialize( GenericReader reader ) { base.Deserialize( reader ); int version = reader.ReadInt(); } } -} \ No newline at end of file +} diff --git a/Scripts/Items/Armor/Leather/LeatherLegs.cs b/Scripts/Items/Armor/Leather/LeatherLegs.cs index 9469c63fd..335d8b62a 100644 --- a/Scripts/Items/Armor/Leather/LeatherLegs.cs +++ b/Scripts/Items/Armor/Leather/LeatherLegs.cs @@ -6,24 +6,24 @@ namespace Server.Items [FlippableAttribute( 0x13cb, 0x13d2 )] public class LeatherLegs : BaseArmor { - public override int BasePhysicalResistance{ get{ return 2; } } - public override int BaseFireResistance{ get{ return 4; } } - public override int BaseColdResistance{ get{ return 3; } } - public override int BasePoisonResistance{ get{ return 3; } } - public override int BaseEnergyResistance{ get{ return 3; } } + public override int BasePhysicalResistance => 2; + public override int BaseFireResistance => 4; + public override int BaseColdResistance => 3; + public override int BasePoisonResistance => 3; + public override int BaseEnergyResistance => 3; - public override int InitMinHits{ get{ return 30; } } - public override int InitMaxHits{ get{ return 40; } } + public override int InitMinHits => 30; + public override int InitMaxHits => 40; - public override int AosStrReq{ get{ return 20; } } - public override int OldStrReq{ get{ return 10; } } + public override int AosStrReq => 20; + public override int OldStrReq => 10; - public override int ArmorBase{ get{ return 13; } } + public override int ArmorBase => 13; - public override ArmorMaterialType MaterialType{ get{ return ArmorMaterialType.Leather; } } - public override CraftResource DefaultResource{ get{ return CraftResource.RegularLeather; } } + public override ArmorMaterialType MaterialType => ArmorMaterialType.Leather; + public override CraftResource DefaultResource => CraftResource.RegularLeather; - public override ArmorMeditationAllowance DefMedAllowance{ get{ return ArmorMeditationAllowance.All; } } + public override ArmorMeditationAllowance DefMedAllowance => ArmorMeditationAllowance.All; [Constructible] public LeatherLegs() : base( 0x13CB ) @@ -34,17 +34,17 @@ namespace Server.Items public LeatherLegs( Serial serial ) : base( serial ) { } - + public override void Serialize( GenericWriter writer ) { base.Serialize( writer ); writer.Write( (int) 0 ); } - + public override void Deserialize(GenericReader reader) { base.Deserialize( reader ); int version = reader.ReadInt(); } } -} \ No newline at end of file +} diff --git a/Scripts/Items/Armor/Leather/LeatherMempo.cs b/Scripts/Items/Armor/Leather/LeatherMempo.cs index e87ddfbf2..e0e836fd5 100644 --- a/Scripts/Items/Armor/Leather/LeatherMempo.cs +++ b/Scripts/Items/Armor/Leather/LeatherMempo.cs @@ -5,24 +5,24 @@ namespace Server.Items { public class LeatherMempo : BaseArmor { - public override int BasePhysicalResistance{ get{ return 2; } } - public override int BaseFireResistance{ get{ return 4; } } - public override int BaseColdResistance{ get{ return 3; } } - public override int BasePoisonResistance{ get{ return 3; } } - public override int BaseEnergyResistance{ get{ return 3; } } + public override int BasePhysicalResistance => 2; + public override int BaseFireResistance => 4; + public override int BaseColdResistance => 3; + public override int BasePoisonResistance => 3; + public override int BaseEnergyResistance => 3; - public override int InitMinHits{ get{ return 35; } } - public override int InitMaxHits{ get{ return 40; } } + public override int InitMinHits => 35; + public override int InitMaxHits => 40; - public override int AosStrReq{ get{ return 30; } } - public override int OldStrReq{ get{ return 30; } } + public override int AosStrReq => 30; + public override int OldStrReq => 30; - public override int ArmorBase{ get{ return 3; } } + public override int ArmorBase => 3; - public override ArmorMaterialType MaterialType{ get{ return ArmorMaterialType.Leather; } } - public override CraftResource DefaultResource { get { return CraftResource.RegularLeather; } } + public override ArmorMaterialType MaterialType => ArmorMaterialType.Leather; + public override CraftResource DefaultResource => CraftResource.RegularLeather; - public override ArmorMeditationAllowance DefMedAllowance{ get{ return ArmorMeditationAllowance.All; } } + public override ArmorMeditationAllowance DefMedAllowance => ArmorMeditationAllowance.All; [Constructible] public LeatherMempo() : base( 0x277A ) @@ -33,17 +33,17 @@ namespace Server.Items public LeatherMempo( Serial serial ) : base( serial ) { } - + public override void Serialize( GenericWriter writer ) { base.Serialize( writer ); writer.Write( (int) 0 ); } - + public override void Deserialize( GenericReader reader ) { base.Deserialize( reader ); int version = reader.ReadInt(); } } -} \ No newline at end of file +} diff --git a/Scripts/Items/Armor/Leather/LeatherNinjaHood.cs b/Scripts/Items/Armor/Leather/LeatherNinjaHood.cs index 199008a00..452d6c8e1 100644 --- a/Scripts/Items/Armor/Leather/LeatherNinjaHood.cs +++ b/Scripts/Items/Armor/Leather/LeatherNinjaHood.cs @@ -5,24 +5,24 @@ namespace Server.Items { public class LeatherNinjaHood : BaseArmor { - public override int BasePhysicalResistance{ get{ return 2; } } - public override int BaseFireResistance{ get{ return 3; } } - public override int BaseColdResistance{ get{ return 3; } } - public override int BasePoisonResistance{ get{ return 3; } } - public override int BaseEnergyResistance{ get{ return 4; } } + public override int BasePhysicalResistance => 2; + public override int BaseFireResistance => 3; + public override int BaseColdResistance => 3; + public override int BasePoisonResistance => 3; + public override int BaseEnergyResistance => 4; - public override int InitMinHits{ get{ return 25; } } - public override int InitMaxHits{ get{ return 45; } } + public override int InitMinHits => 25; + public override int InitMaxHits => 45; - public override int AosStrReq{ get{ return 10; } } - public override int OldStrReq{ get{ return 10; } } + public override int AosStrReq => 10; + public override int OldStrReq => 10; - public override int ArmorBase{ get{ return 3; } } + public override int ArmorBase => 3; - public override ArmorMaterialType MaterialType{ get{ return ArmorMaterialType.Leather; } } - public override CraftResource DefaultResource { get { return CraftResource.RegularLeather; } } + public override ArmorMaterialType MaterialType => ArmorMaterialType.Leather; + public override CraftResource DefaultResource => CraftResource.RegularLeather; - public override ArmorMeditationAllowance DefMedAllowance{ get{ return ArmorMeditationAllowance.All; } } + public override ArmorMeditationAllowance DefMedAllowance => ArmorMeditationAllowance.All; [Constructible] public LeatherNinjaHood() : base( 0x278E ) @@ -33,17 +33,17 @@ namespace Server.Items public LeatherNinjaHood( Serial serial ) : base( serial ) { } - + public override void Serialize( GenericWriter writer ) { base.Serialize( writer ); writer.Write( (int) 0 ); } - + public override void Deserialize( GenericReader reader ) { base.Deserialize( reader ); int version = reader.ReadInt(); } } -} \ No newline at end of file +} diff --git a/Scripts/Items/Armor/Leather/LeatherNinjaJacket.cs b/Scripts/Items/Armor/Leather/LeatherNinjaJacket.cs index 4732038ba..de2f3f1e3 100644 --- a/Scripts/Items/Armor/Leather/LeatherNinjaJacket.cs +++ b/Scripts/Items/Armor/Leather/LeatherNinjaJacket.cs @@ -5,24 +5,24 @@ namespace Server.Items { public class LeatherNinjaJacket : BaseArmor { - public override int BasePhysicalResistance{ get{ return 2; } } - public override int BaseFireResistance{ get{ return 4; } } - public override int BaseColdResistance{ get{ return 3; } } - public override int BasePoisonResistance{ get{ return 3; } } - public override int BaseEnergyResistance{ get{ return 3; } } + public override int BasePhysicalResistance => 2; + public override int BaseFireResistance => 4; + public override int BaseColdResistance => 3; + public override int BasePoisonResistance => 3; + public override int BaseEnergyResistance => 3; - public override int InitMinHits{ get{ return 55; } } - public override int InitMaxHits{ get{ return 65; } } + public override int InitMinHits => 55; + public override int InitMaxHits => 65; - public override int AosStrReq{ get{ return 10; } } - public override int OldStrReq{ get{ return 10; } } + public override int AosStrReq => 10; + public override int OldStrReq => 10; - public override int ArmorBase{ get{ return 3; } } + public override int ArmorBase => 3; - public override ArmorMaterialType MaterialType{ get{ return ArmorMaterialType.Leather; } } - public override CraftResource DefaultResource { get { return CraftResource.RegularLeather; } } + public override ArmorMaterialType MaterialType => ArmorMaterialType.Leather; + public override CraftResource DefaultResource => CraftResource.RegularLeather; - public override ArmorMeditationAllowance DefMedAllowance{ get{ return ArmorMeditationAllowance.All; } } + public override ArmorMeditationAllowance DefMedAllowance => ArmorMeditationAllowance.All; [Constructible] public LeatherNinjaJacket() : base( 0x2793 ) @@ -33,17 +33,17 @@ namespace Server.Items public LeatherNinjaJacket( Serial serial ) : base( serial ) { } - + public override void Serialize( GenericWriter writer ) { base.Serialize( writer ); writer.Write( (int) 0 ); } - + public override void Deserialize( GenericReader reader ) { base.Deserialize( reader ); int version = reader.ReadInt(); } } -} \ No newline at end of file +} diff --git a/Scripts/Items/Armor/Leather/LeatherNinjaMitts.cs b/Scripts/Items/Armor/Leather/LeatherNinjaMitts.cs index 44da2972b..95f94a50b 100644 --- a/Scripts/Items/Armor/Leather/LeatherNinjaMitts.cs +++ b/Scripts/Items/Armor/Leather/LeatherNinjaMitts.cs @@ -5,24 +5,24 @@ namespace Server.Items { public class LeatherNinjaMitts : BaseArmor { - public override int BasePhysicalResistance{ get{ return 2; } } - public override int BaseFireResistance{ get{ return 4; } } - public override int BaseColdResistance{ get{ return 3; } } - public override int BasePoisonResistance{ get{ return 3; } } - public override int BaseEnergyResistance{ get{ return 3; } } + public override int BasePhysicalResistance => 2; + public override int BaseFireResistance => 4; + public override int BaseColdResistance => 3; + public override int BasePoisonResistance => 3; + public override int BaseEnergyResistance => 3; - public override int InitMinHits{ get{ return 25; } } - public override int InitMaxHits{ get{ return 25; } } + public override int InitMinHits => 25; + public override int InitMaxHits => 25; - public override int AosStrReq{ get{ return 10; } } - public override int OldStrReq{ get{ return 10; } } + public override int AosStrReq => 10; + public override int OldStrReq => 10; - public override int ArmorBase{ get{ return 3; } } + public override int ArmorBase => 3; - public override ArmorMaterialType MaterialType{ get{ return ArmorMaterialType.Leather; } } - public override CraftResource DefaultResource { get { return CraftResource.RegularLeather; } } + public override ArmorMaterialType MaterialType => ArmorMaterialType.Leather; + public override CraftResource DefaultResource => CraftResource.RegularLeather; - public override ArmorMeditationAllowance DefMedAllowance{ get{ return ArmorMeditationAllowance.All; } } + public override ArmorMeditationAllowance DefMedAllowance => ArmorMeditationAllowance.All; [Constructible] public LeatherNinjaMitts() : base( 0x2792 ) @@ -33,13 +33,13 @@ namespace Server.Items public LeatherNinjaMitts( Serial serial ) : base( serial ) { } - + public override void Serialize( GenericWriter writer ) { base.Serialize( writer ); writer.Write( (int) 2 ); } - + public override void Deserialize( GenericReader reader ) { base.Deserialize( reader ); @@ -63,4 +63,4 @@ namespace Server.Items } } } -} \ No newline at end of file +} diff --git a/Scripts/Items/Armor/Leather/LeatherNinjaPants.cs b/Scripts/Items/Armor/Leather/LeatherNinjaPants.cs index d1fe5b34d..b64e6c699 100644 --- a/Scripts/Items/Armor/Leather/LeatherNinjaPants.cs +++ b/Scripts/Items/Armor/Leather/LeatherNinjaPants.cs @@ -5,24 +5,24 @@ namespace Server.Items { public class LeatherNinjaPants : BaseArmor { - public override int BasePhysicalResistance{ get{ return 2; } } - public override int BaseFireResistance{ get{ return 4; } } - public override int BaseColdResistance{ get{ return 3; } } - public override int BasePoisonResistance{ get{ return 3; } } - public override int BaseEnergyResistance{ get{ return 3; } } + public override int BasePhysicalResistance => 2; + public override int BaseFireResistance => 4; + public override int BaseColdResistance => 3; + public override int BasePoisonResistance => 3; + public override int BaseEnergyResistance => 3; - public override int InitMinHits{ get{ return 40; } } - public override int InitMaxHits{ get{ return 50; } } + public override int InitMinHits => 40; + public override int InitMaxHits => 50; - public override int AosStrReq{ get{ return 10; } } - public override int OldStrReq{ get{ return 10; } } + public override int AosStrReq => 10; + public override int OldStrReq => 10; - public override int ArmorBase{ get{ return 3; } } + public override int ArmorBase => 3; - public override ArmorMaterialType MaterialType{ get{ return ArmorMaterialType.Leather; } } - public override CraftResource DefaultResource { get { return CraftResource.RegularLeather; } } + public override ArmorMaterialType MaterialType => ArmorMaterialType.Leather; + public override CraftResource DefaultResource => CraftResource.RegularLeather; - public override ArmorMeditationAllowance DefMedAllowance{ get{ return ArmorMeditationAllowance.All; } } + public override ArmorMeditationAllowance DefMedAllowance => ArmorMeditationAllowance.All; [Constructible] public LeatherNinjaPants() : base( 0x2791 ) @@ -33,17 +33,17 @@ namespace Server.Items public LeatherNinjaPants( Serial serial ) : base( serial ) { } - + public override void Serialize( GenericWriter writer ) { base.Serialize( writer ); writer.Write( (int) 0 ); } - + public override void Deserialize( GenericReader reader ) { base.Deserialize( reader ); int version = reader.ReadInt(); } } -} \ No newline at end of file +} diff --git a/Scripts/Items/Armor/Leather/LeatherShorts.cs b/Scripts/Items/Armor/Leather/LeatherShorts.cs index b0c15e0e3..b15812107 100644 --- a/Scripts/Items/Armor/Leather/LeatherShorts.cs +++ b/Scripts/Items/Armor/Leather/LeatherShorts.cs @@ -6,24 +6,24 @@ namespace Server.Items [FlippableAttribute( 0x1c00, 0x1c01 )] public class LeatherShorts : BaseArmor { - public override int BasePhysicalResistance{ get{ return 2; } } - public override int BaseFireResistance{ get{ return 4; } } - public override int BaseColdResistance{ get{ return 3; } } - public override int BasePoisonResistance{ get{ return 3; } } - public override int BaseEnergyResistance{ get{ return 3; } } + public override int BasePhysicalResistance => 2; + public override int BaseFireResistance => 4; + public override int BaseColdResistance => 3; + public override int BasePoisonResistance => 3; + public override int BaseEnergyResistance => 3; - public override int InitMinHits{ get{ return 30; } } - public override int InitMaxHits{ get{ return 40; } } + public override int InitMinHits => 30; + public override int InitMaxHits => 40; - public override int AosStrReq{ get{ return 20; } } - public override int OldStrReq{ get{ return 10; } } + public override int AosStrReq => 20; + public override int OldStrReq => 10; - public override int ArmorBase{ get{ return 13; } } + public override int ArmorBase => 13; - public override ArmorMaterialType MaterialType{ get{ return ArmorMaterialType.Leather; } } - public override CraftResource DefaultResource{ get{ return CraftResource.RegularLeather; } } + public override ArmorMaterialType MaterialType => ArmorMaterialType.Leather; + public override CraftResource DefaultResource => CraftResource.RegularLeather; - public override ArmorMeditationAllowance DefMedAllowance{ get{ return ArmorMeditationAllowance.All; } } + public override ArmorMeditationAllowance DefMedAllowance => ArmorMeditationAllowance.All; public override bool AllowMaleWearer => false; diff --git a/Scripts/Items/Armor/Leather/LeatherSkirt.cs b/Scripts/Items/Armor/Leather/LeatherSkirt.cs index e20d482fb..28bb199f4 100644 --- a/Scripts/Items/Armor/Leather/LeatherSkirt.cs +++ b/Scripts/Items/Armor/Leather/LeatherSkirt.cs @@ -6,24 +6,24 @@ namespace Server.Items [FlippableAttribute( 0x1c08, 0x1c09 )] public class LeatherSkirt : BaseArmor { - public override int BasePhysicalResistance{ get{ return 2; } } - public override int BaseFireResistance{ get{ return 4; } } - public override int BaseColdResistance{ get{ return 3; } } - public override int BasePoisonResistance{ get{ return 3; } } - public override int BaseEnergyResistance{ get{ return 3; } } + public override int BasePhysicalResistance => 2; + public override int BaseFireResistance => 4; + public override int BaseColdResistance => 3; + public override int BasePoisonResistance => 3; + public override int BaseEnergyResistance => 3; - public override int InitMinHits{ get{ return 30; } } - public override int InitMaxHits{ get{ return 40; } } + public override int InitMinHits => 30; + public override int InitMaxHits => 40; - public override int AosStrReq{ get{ return 20; } } - public override int OldStrReq{ get{ return 10; } } + public override int AosStrReq => 20; + public override int OldStrReq => 10; - public override int ArmorBase{ get{ return 13; } } + public override int ArmorBase => 13; - public override ArmorMaterialType MaterialType{ get{ return ArmorMaterialType.Leather; } } - public override CraftResource DefaultResource{ get{ return CraftResource.RegularLeather; } } + public override ArmorMaterialType MaterialType => ArmorMaterialType.Leather; + public override CraftResource DefaultResource => CraftResource.RegularLeather; - public override ArmorMeditationAllowance DefMedAllowance{ get{ return ArmorMeditationAllowance.All; } } + public override ArmorMeditationAllowance DefMedAllowance => ArmorMeditationAllowance.All; public override bool AllowMaleWearer => false; diff --git a/Scripts/Items/Armor/Leather/LeatherSuneate.cs b/Scripts/Items/Armor/Leather/LeatherSuneate.cs index 8ec92b69d..cda050d03 100644 --- a/Scripts/Items/Armor/Leather/LeatherSuneate.cs +++ b/Scripts/Items/Armor/Leather/LeatherSuneate.cs @@ -5,24 +5,24 @@ namespace Server.Items { public class LeatherSuneate : BaseArmor { - public override int BasePhysicalResistance{ get{ return 2; } } - public override int BaseFireResistance{ get{ return 4; } } - public override int BaseColdResistance{ get{ return 3; } } - public override int BasePoisonResistance{ get{ return 3; } } - public override int BaseEnergyResistance{ get{ return 3; } } + public override int BasePhysicalResistance => 2; + public override int BaseFireResistance => 4; + public override int BaseColdResistance => 3; + public override int BasePoisonResistance => 3; + public override int BaseEnergyResistance => 3; - public override int InitMinHits{ get{ return 25; } } - public override int InitMaxHits{ get{ return 40; } } + public override int InitMinHits => 25; + public override int InitMaxHits => 40; - public override int AosStrReq{ get{ return 20; } } - public override int OldStrReq{ get{ return 20; } } + public override int AosStrReq => 20; + public override int OldStrReq => 20; - public override int ArmorBase{ get{ return 3; } } + public override int ArmorBase => 3; - public override ArmorMaterialType MaterialType{ get{ return ArmorMaterialType.Leather; } } - public override CraftResource DefaultResource { get { return CraftResource.RegularLeather; } } + public override ArmorMaterialType MaterialType => ArmorMaterialType.Leather; + public override CraftResource DefaultResource => CraftResource.RegularLeather; - public override ArmorMeditationAllowance DefMedAllowance{ get{ return ArmorMeditationAllowance.All; } } + public override ArmorMeditationAllowance DefMedAllowance => ArmorMeditationAllowance.All; [Constructible] public LeatherSuneate() : base( 0x2786 ) @@ -33,17 +33,17 @@ namespace Server.Items public LeatherSuneate( Serial serial ) : base( serial ) { } - + public override void Serialize( GenericWriter writer ) { base.Serialize( writer ); writer.Write( (int) 0 ); } - + public override void Deserialize( GenericReader reader ) { base.Deserialize( reader ); int version = reader.ReadInt(); } } -} \ No newline at end of file +} diff --git a/Scripts/Items/Armor/Plate/DecorativePlateKabuto.cs b/Scripts/Items/Armor/Plate/DecorativePlateKabuto.cs index a7c7ae708..5f6e907e2 100644 --- a/Scripts/Items/Armor/Plate/DecorativePlateKabuto.cs +++ b/Scripts/Items/Armor/Plate/DecorativePlateKabuto.cs @@ -5,21 +5,21 @@ namespace Server.Items { public class DecorativePlateKabuto : BaseArmor { - public override int BasePhysicalResistance{ get{ return 6; } } - public override int BaseFireResistance{ get{ return 2; } } - public override int BaseColdResistance{ get{ return 2; } } - public override int BasePoisonResistance{ get{ return 2; } } - public override int BaseEnergyResistance{ get{ return 3; } } + public override int BasePhysicalResistance => 6; + public override int BaseFireResistance => 2; + public override int BaseColdResistance => 2; + public override int BasePoisonResistance => 2; + public override int BaseEnergyResistance => 3; - public override int InitMinHits{ get{ return 55; } } - public override int InitMaxHits{ get{ return 75; } } + public override int InitMinHits => 55; + public override int InitMaxHits => 75; - public override int AosStrReq{ get{ return 70; } } - public override int OldStrReq{ get{ return 70; } } + public override int AosStrReq => 70; + public override int OldStrReq => 70; - public override int ArmorBase{ get{ return 3; } } + public override int ArmorBase => 3; - public override ArmorMaterialType MaterialType{ get{ return ArmorMaterialType.Plate; } } + public override ArmorMaterialType MaterialType => ArmorMaterialType.Plate; [Constructible] public DecorativePlateKabuto() : base( 0x2778 ) @@ -30,17 +30,17 @@ namespace Server.Items public DecorativePlateKabuto( Serial serial ) : base( serial ) { } - + public override void Serialize( GenericWriter writer ) { base.Serialize( writer ); writer.Write( (int) 0 ); } - + public override void Deserialize(GenericReader reader) { base.Deserialize( reader ); int version = reader.ReadInt(); } } -} \ No newline at end of file +} diff --git a/Scripts/Items/Armor/Plate/FemalePlateChest.cs b/Scripts/Items/Armor/Plate/FemalePlateChest.cs index 9f9599974..1d85f6367 100644 --- a/Scripts/Items/Armor/Plate/FemalePlateChest.cs +++ b/Scripts/Items/Armor/Plate/FemalePlateChest.cs @@ -6,25 +6,25 @@ namespace Server.Items [FlippableAttribute( 0x1c04, 0x1c05 )] public class FemalePlateChest : BaseArmor { - public override int BasePhysicalResistance{ get{ return 5; } } - public override int BaseFireResistance{ get{ return 3; } } - public override int BaseColdResistance{ get{ return 2; } } - public override int BasePoisonResistance{ get{ return 3; } } - public override int BaseEnergyResistance{ get{ return 2; } } + public override int BasePhysicalResistance => 5; + public override int BaseFireResistance => 3; + public override int BaseColdResistance => 2; + public override int BasePoisonResistance => 3; + public override int BaseEnergyResistance => 2; - public override int InitMinHits{ get{ return 50; } } - public override int InitMaxHits{ get{ return 65; } } + public override int InitMinHits => 50; + public override int InitMaxHits => 65; - public override int AosStrReq{ get{ return 95; } } - public override int OldStrReq{ get{ return 45; } } + public override int AosStrReq => 95; + public override int OldStrReq => 45; - public override int OldDexBonus{ get{ return -5; } } + public override int OldDexBonus => -5; public override bool AllowMaleWearer => false; - public override int ArmorBase{ get{ return 30; } } + public override int ArmorBase => 30; - public override ArmorMaterialType MaterialType{ get{ return ArmorMaterialType.Plate; } } + public override ArmorMaterialType MaterialType => ArmorMaterialType.Plate; [Constructible] public FemalePlateChest() : base( 0x1C04 ) diff --git a/Scripts/Items/Armor/Plate/FemaleWoodlandChest.cs b/Scripts/Items/Armor/Plate/FemaleWoodlandChest.cs index bbdfa7355..bae16bf0e 100644 --- a/Scripts/Items/Armor/Plate/FemaleWoodlandChest.cs +++ b/Scripts/Items/Armor/Plate/FemaleWoodlandChest.cs @@ -7,23 +7,23 @@ namespace Server.Items [FlippableAttribute( 0x2B6D, 0x3164 )] public class FemaleElvenPlateChest : BaseArmor { - public override int BasePhysicalResistance{ get{ return 5; } } - public override int BaseFireResistance{ get{ return 3; } } - public override int BaseColdResistance{ get{ return 2; } } - public override int BasePoisonResistance{ get{ return 3; } } - public override int BaseEnergyResistance{ get{ return 2; } } + public override int BasePhysicalResistance => 5; + public override int BaseFireResistance => 3; + public override int BaseColdResistance => 2; + public override int BasePoisonResistance => 3; + public override int BaseEnergyResistance => 2; - public override int InitMinHits{ get{ return 50; } } - public override int InitMaxHits{ get{ return 65; } } + public override int InitMinHits => 50; + public override int InitMaxHits => 65; - public override int AosStrReq{ get{ return 95; } } - public override int OldStrReq{ get{ return 95; } } + public override int AosStrReq => 95; + public override int OldStrReq => 95; public override bool AllowMaleWearer => false; - public override int ArmorBase{ get{ return 30; } } + public override int ArmorBase => 30; - public override ArmorMaterialType MaterialType{ get{ return ArmorMaterialType.Plate; } } + public override ArmorMaterialType MaterialType => ArmorMaterialType.Plate; [Constructible] public FemaleElvenPlateChest() : base( 0x2B6D ) diff --git a/Scripts/Items/Armor/Plate/HeavyPlateJingasa.cs b/Scripts/Items/Armor/Plate/HeavyPlateJingasa.cs index a4c3e3ade..806be7f2c 100644 --- a/Scripts/Items/Armor/Plate/HeavyPlateJingasa.cs +++ b/Scripts/Items/Armor/Plate/HeavyPlateJingasa.cs @@ -5,21 +5,21 @@ namespace Server.Items { public class HeavyPlateJingasa : BaseArmor { - public override int BasePhysicalResistance{ get{ return 7; } } - public override int BaseFireResistance{ get{ return 2; } } - public override int BaseColdResistance{ get{ return 2; } } - public override int BasePoisonResistance{ get{ return 2; } } - public override int BaseEnergyResistance{ get{ return 2; } } + public override int BasePhysicalResistance => 7; + public override int BaseFireResistance => 2; + public override int BaseColdResistance => 2; + public override int BasePoisonResistance => 2; + public override int BaseEnergyResistance => 2; - public override int InitMinHits{ get{ return 50; } } - public override int InitMaxHits{ get{ return 70; } } + public override int InitMinHits => 50; + public override int InitMaxHits => 70; - public override int AosStrReq{ get{ return 55; } } - public override int OldStrReq{ get{ return 55; } } + public override int AosStrReq => 55; + public override int OldStrReq => 55; - public override int ArmorBase{ get{ return 4; } } + public override int ArmorBase => 4; - public override ArmorMaterialType MaterialType{ get{ return ArmorMaterialType.Plate; } } + public override ArmorMaterialType MaterialType => ArmorMaterialType.Plate; [Constructible] public HeavyPlateJingasa() : base( 0x2777 ) @@ -30,17 +30,17 @@ namespace Server.Items public HeavyPlateJingasa( Serial serial ) : base( serial ) { } - + public override void Serialize( GenericWriter writer ) { base.Serialize( writer ); writer.Write( (int) 0 ); } - + public override void Deserialize(GenericReader reader) { base.Deserialize( reader ); int version = reader.ReadInt(); } } -} \ No newline at end of file +} diff --git a/Scripts/Items/Armor/Plate/LightPlateJingasa.cs b/Scripts/Items/Armor/Plate/LightPlateJingasa.cs index ef9158b3f..3b5d5922f 100644 --- a/Scripts/Items/Armor/Plate/LightPlateJingasa.cs +++ b/Scripts/Items/Armor/Plate/LightPlateJingasa.cs @@ -5,21 +5,21 @@ namespace Server.Items { public class LightPlateJingasa : BaseArmor { - public override int BasePhysicalResistance{ get{ return 7; } } - public override int BaseFireResistance{ get{ return 2; } } - public override int BaseColdResistance{ get{ return 2; } } - public override int BasePoisonResistance{ get{ return 2; } } - public override int BaseEnergyResistance{ get{ return 2; } } + public override int BasePhysicalResistance => 7; + public override int BaseFireResistance => 2; + public override int BaseColdResistance => 2; + public override int BasePoisonResistance => 2; + public override int BaseEnergyResistance => 2; - public override int InitMinHits{ get{ return 55; } } - public override int InitMaxHits{ get{ return 60; } } + public override int InitMinHits => 55; + public override int InitMaxHits => 60; - public override int AosStrReq{ get{ return 55; } } - public override int OldStrReq{ get{ return 55; } } + public override int AosStrReq => 55; + public override int OldStrReq => 55; - public override int ArmorBase{ get{ return 4; } } + public override int ArmorBase => 4; - public override ArmorMaterialType MaterialType{ get{ return ArmorMaterialType.Plate; } } + public override ArmorMaterialType MaterialType => ArmorMaterialType.Plate; [Constructible] public LightPlateJingasa() : base( 0x2781 ) @@ -30,17 +30,17 @@ namespace Server.Items public LightPlateJingasa( Serial serial ) : base( serial ) { } - + public override void Serialize( GenericWriter writer ) { base.Serialize( writer ); writer.Write( (int) 0 ); } - + public override void Deserialize(GenericReader reader) { base.Deserialize( reader ); int version = reader.ReadInt(); } } -} \ No newline at end of file +} diff --git a/Scripts/Items/Armor/Plate/PlateArms.cs b/Scripts/Items/Armor/Plate/PlateArms.cs index cc4e70931..cb8c4050e 100644 --- a/Scripts/Items/Armor/Plate/PlateArms.cs +++ b/Scripts/Items/Armor/Plate/PlateArms.cs @@ -6,23 +6,23 @@ namespace Server.Items [FlippableAttribute( 0x1410, 0x1417 )] public class PlateArms : BaseArmor { - public override int BasePhysicalResistance{ get{ return 5; } } - public override int BaseFireResistance{ get{ return 3; } } - public override int BaseColdResistance{ get{ return 2; } } - public override int BasePoisonResistance{ get{ return 3; } } - public override int BaseEnergyResistance{ get{ return 2; } } + public override int BasePhysicalResistance => 5; + public override int BaseFireResistance => 3; + public override int BaseColdResistance => 2; + public override int BasePoisonResistance => 3; + public override int BaseEnergyResistance => 2; - public override int InitMinHits{ get{ return 50; } } - public override int InitMaxHits{ get{ return 65; } } + public override int InitMinHits => 50; + public override int InitMaxHits => 65; - public override int AosStrReq{ get{ return 80; } } - public override int OldStrReq{ get{ return 40; } } + public override int AosStrReq => 80; + public override int OldStrReq => 40; - public override int OldDexBonus{ get{ return -2; } } + public override int OldDexBonus => -2; - public override int ArmorBase{ get{ return 40; } } + public override int ArmorBase => 40; - public override ArmorMaterialType MaterialType{ get{ return ArmorMaterialType.Plate; } } + public override ArmorMaterialType MaterialType => ArmorMaterialType.Plate; [Constructible] public PlateArms() : base( 0x1410 ) @@ -33,13 +33,13 @@ namespace Server.Items public PlateArms( Serial serial ) : base( serial ) { } - + public override void Serialize( GenericWriter writer ) { base.Serialize( writer ); writer.Write( (int) 0 ); } - + public override void Deserialize(GenericReader reader) { base.Deserialize( reader ); @@ -49,4 +49,4 @@ namespace Server.Items Weight = 5.0; } } -} \ No newline at end of file +} diff --git a/Scripts/Items/Armor/Plate/PlateBattleKabuto.cs b/Scripts/Items/Armor/Plate/PlateBattleKabuto.cs index 91f7703bf..a69174ff9 100644 --- a/Scripts/Items/Armor/Plate/PlateBattleKabuto.cs +++ b/Scripts/Items/Armor/Plate/PlateBattleKabuto.cs @@ -5,21 +5,21 @@ namespace Server.Items { public class PlateBattleKabuto : BaseArmor { - public override int BasePhysicalResistance{ get{ return 6; } } - public override int BaseFireResistance{ get{ return 2; } } - public override int BaseColdResistance{ get{ return 2; } } - public override int BasePoisonResistance{ get{ return 2; } } - public override int BaseEnergyResistance{ get{ return 3; } } + public override int BasePhysicalResistance => 6; + public override int BaseFireResistance => 2; + public override int BaseColdResistance => 2; + public override int BasePoisonResistance => 2; + public override int BaseEnergyResistance => 3; - public override int InitMinHits{ get{ return 60; } } - public override int InitMaxHits{ get{ return 65; } } + public override int InitMinHits => 60; + public override int InitMaxHits => 65; - public override int AosStrReq{ get{ return 70; } } - public override int OldStrReq{ get{ return 70; } } + public override int AosStrReq => 70; + public override int OldStrReq => 70; - public override int ArmorBase{ get{ return 3; } } + public override int ArmorBase => 3; - public override ArmorMaterialType MaterialType{ get{ return ArmorMaterialType.Plate; } } + public override ArmorMaterialType MaterialType => ArmorMaterialType.Plate; [Constructible] public PlateBattleKabuto() : base( 0x2785 ) @@ -30,17 +30,17 @@ namespace Server.Items public PlateBattleKabuto( Serial serial ) : base( serial ) { } - + public override void Serialize( GenericWriter writer ) { base.Serialize( writer ); writer.Write( (int) 0 ); } - + public override void Deserialize(GenericReader reader) { base.Deserialize( reader ); int version = reader.ReadInt(); } } -} \ No newline at end of file +} diff --git a/Scripts/Items/Armor/Plate/PlateChest.cs b/Scripts/Items/Armor/Plate/PlateChest.cs index 8d8a8db7d..cbf94e028 100644 --- a/Scripts/Items/Armor/Plate/PlateChest.cs +++ b/Scripts/Items/Armor/Plate/PlateChest.cs @@ -6,23 +6,23 @@ namespace Server.Items [FlippableAttribute( 0x1415, 0x1416 )] public class PlateChest : BaseArmor { - public override int BasePhysicalResistance{ get{ return 5; } } - public override int BaseFireResistance{ get{ return 3; } } - public override int BaseColdResistance{ get{ return 2; } } - public override int BasePoisonResistance{ get{ return 3; } } - public override int BaseEnergyResistance{ get{ return 2; } } + public override int BasePhysicalResistance => 5; + public override int BaseFireResistance => 3; + public override int BaseColdResistance => 2; + public override int BasePoisonResistance => 3; + public override int BaseEnergyResistance => 2; - public override int InitMinHits{ get{ return 50; } } - public override int InitMaxHits{ get{ return 65; } } + public override int InitMinHits => 50; + public override int InitMaxHits => 65; - public override int AosStrReq{ get{ return 95; } } - public override int OldStrReq{ get{ return 60; } } + public override int AosStrReq => 95; + public override int OldStrReq => 60; - public override int OldDexBonus{ get{ return -8; } } + public override int OldDexBonus => -8; - public override int ArmorBase{ get{ return 40; } } + public override int ArmorBase => 40; - public override ArmorMaterialType MaterialType{ get{ return ArmorMaterialType.Plate; } } + public override ArmorMaterialType MaterialType => ArmorMaterialType.Plate; [Constructible] public PlateChest() : base( 0x1415 ) @@ -33,13 +33,13 @@ namespace Server.Items public PlateChest( Serial serial ) : base( serial ) { } - + public override void Serialize( GenericWriter writer ) { base.Serialize( writer ); writer.Write( (int) 0 ); } - + public override void Deserialize(GenericReader reader) { base.Deserialize( reader ); @@ -49,4 +49,4 @@ namespace Server.Items Weight = 10.0; } } -} \ No newline at end of file +} diff --git a/Scripts/Items/Armor/Plate/PlateDo.cs b/Scripts/Items/Armor/Plate/PlateDo.cs index d5d4a4a3a..ae96d65eb 100644 --- a/Scripts/Items/Armor/Plate/PlateDo.cs +++ b/Scripts/Items/Armor/Plate/PlateDo.cs @@ -5,21 +5,21 @@ namespace Server.Items { public class PlateDo : BaseArmor { - public override int BasePhysicalResistance{ get{ return 5; } } - public override int BaseFireResistance{ get{ return 3; } } - public override int BaseColdResistance{ get{ return 2; } } - public override int BasePoisonResistance{ get{ return 3; } } - public override int BaseEnergyResistance{ get{ return 2; } } + public override int BasePhysicalResistance => 5; + public override int BaseFireResistance => 3; + public override int BaseColdResistance => 2; + public override int BasePoisonResistance => 3; + public override int BaseEnergyResistance => 2; - public override int InitMinHits{ get{ return 60; } } - public override int InitMaxHits{ get{ return 70; } } + public override int InitMinHits => 60; + public override int InitMaxHits => 70; - public override int AosStrReq{ get{ return 85; } } - public override int OldStrReq{ get{ return 85; } } + public override int AosStrReq => 85; + public override int OldStrReq => 85; - public override int ArmorBase{ get{ return 3; } } + public override int ArmorBase => 3; - public override ArmorMaterialType MaterialType{ get{ return ArmorMaterialType.Plate; } } + public override ArmorMaterialType MaterialType => ArmorMaterialType.Plate; [Constructible] public PlateDo() : base( 0x277D ) @@ -30,17 +30,17 @@ namespace Server.Items public PlateDo( Serial serial ) : base( serial ) { } - + public override void Serialize( GenericWriter writer ) { base.Serialize( writer ); writer.Write( (int) 0 ); } - + public override void Deserialize(GenericReader reader) { base.Deserialize( reader ); int version = reader.ReadInt(); } } -} \ No newline at end of file +} diff --git a/Scripts/Items/Armor/Plate/PlateGloves.cs b/Scripts/Items/Armor/Plate/PlateGloves.cs index 7debe210c..d21185100 100644 --- a/Scripts/Items/Armor/Plate/PlateGloves.cs +++ b/Scripts/Items/Armor/Plate/PlateGloves.cs @@ -6,23 +6,23 @@ namespace Server.Items [FlippableAttribute( 0x1414, 0x1418 )] public class PlateGloves : BaseArmor { - public override int BasePhysicalResistance{ get{ return 5; } } - public override int BaseFireResistance{ get{ return 3; } } - public override int BaseColdResistance{ get{ return 2; } } - public override int BasePoisonResistance{ get{ return 3; } } - public override int BaseEnergyResistance{ get{ return 2; } } + public override int BasePhysicalResistance => 5; + public override int BaseFireResistance => 3; + public override int BaseColdResistance => 2; + public override int BasePoisonResistance => 3; + public override int BaseEnergyResistance => 2; - public override int InitMinHits{ get{ return 50; } } - public override int InitMaxHits{ get{ return 65; } } + public override int InitMinHits => 50; + public override int InitMaxHits => 65; - public override int AosStrReq{ get{ return 70; } } - public override int OldStrReq{ get{ return 30; } } + public override int AosStrReq => 70; + public override int OldStrReq => 30; - public override int OldDexBonus{ get{ return -2; } } + public override int OldDexBonus => -2; - public override int ArmorBase{ get{ return 40; } } + public override int ArmorBase => 40; - public override ArmorMaterialType MaterialType{ get{ return ArmorMaterialType.Plate; } } + public override ArmorMaterialType MaterialType => ArmorMaterialType.Plate; [Constructible] public PlateGloves() : base( 0x1414 ) @@ -33,13 +33,13 @@ namespace Server.Items public PlateGloves( Serial serial ) : base( serial ) { } - + public override void Serialize( GenericWriter writer ) { base.Serialize( writer ); writer.Write( (int) 0 ); } - + public override void Deserialize(GenericReader reader) { base.Deserialize( reader ); @@ -49,4 +49,4 @@ namespace Server.Items Weight = 2.0; } } -} \ No newline at end of file +} diff --git a/Scripts/Items/Armor/Plate/PlateGorget.cs b/Scripts/Items/Armor/Plate/PlateGorget.cs index 30d4e7135..ceaac0d87 100644 --- a/Scripts/Items/Armor/Plate/PlateGorget.cs +++ b/Scripts/Items/Armor/Plate/PlateGorget.cs @@ -5,23 +5,23 @@ namespace Server.Items { public class PlateGorget : BaseArmor { - public override int BasePhysicalResistance{ get{ return 5; } } - public override int BaseFireResistance{ get{ return 3; } } - public override int BaseColdResistance{ get{ return 2; } } - public override int BasePoisonResistance{ get{ return 3; } } - public override int BaseEnergyResistance{ get{ return 2; } } + public override int BasePhysicalResistance => 5; + public override int BaseFireResistance => 3; + public override int BaseColdResistance => 2; + public override int BasePoisonResistance => 3; + public override int BaseEnergyResistance => 2; - public override int InitMinHits{ get{ return 50; } } - public override int InitMaxHits{ get{ return 65; } } + public override int InitMinHits => 50; + public override int InitMaxHits => 65; - public override int AosStrReq{ get{ return 45; } } - public override int OldStrReq{ get{ return 30; } } + public override int AosStrReq => 45; + public override int OldStrReq => 30; - public override int OldDexBonus{ get{ return -1; } } + public override int OldDexBonus => -1; - public override int ArmorBase{ get{ return 40; } } + public override int ArmorBase => 40; - public override ArmorMaterialType MaterialType{ get{ return ArmorMaterialType.Plate; } } + public override ArmorMaterialType MaterialType => ArmorMaterialType.Plate; [Constructible] public PlateGorget() : base( 0x1413 ) @@ -32,17 +32,17 @@ namespace Server.Items public PlateGorget( Serial serial ) : base( serial ) { } - + public override void Serialize( GenericWriter writer ) { base.Serialize( writer ); writer.Write( (int) 0 ); } - + public override void Deserialize(GenericReader reader) { base.Deserialize( reader ); int version = reader.ReadInt(); } } -} \ No newline at end of file +} diff --git a/Scripts/Items/Armor/Plate/PlateHaidate.cs b/Scripts/Items/Armor/Plate/PlateHaidate.cs index 86c9a7fb4..e541af93d 100644 --- a/Scripts/Items/Armor/Plate/PlateHaidate.cs +++ b/Scripts/Items/Armor/Plate/PlateHaidate.cs @@ -5,21 +5,21 @@ namespace Server.Items { public class PlateHaidate : BaseArmor { - public override int BasePhysicalResistance{ get{ return 5; } } - public override int BaseFireResistance{ get{ return 3; } } - public override int BaseColdResistance{ get{ return 2; } } - public override int BasePoisonResistance{ get{ return 3; } } - public override int BaseEnergyResistance{ get{ return 2; } } + public override int BasePhysicalResistance => 5; + public override int BaseFireResistance => 3; + public override int BaseColdResistance => 2; + public override int BasePoisonResistance => 3; + public override int BaseEnergyResistance => 2; - public override int InitMinHits{ get{ return 55; } } - public override int InitMaxHits{ get{ return 65; } } + public override int InitMinHits => 55; + public override int InitMaxHits => 65; - public override int AosStrReq{ get{ return 80; } } - public override int OldStrReq{ get{ return 80; } } + public override int AosStrReq => 80; + public override int OldStrReq => 80; - public override int ArmorBase{ get{ return 3; } } + public override int ArmorBase => 3; - public override ArmorMaterialType MaterialType{ get{ return ArmorMaterialType.Plate; } } + public override ArmorMaterialType MaterialType => ArmorMaterialType.Plate; [Constructible] public PlateHaidate() : base( 0x278D ) @@ -30,17 +30,17 @@ namespace Server.Items public PlateHaidate( Serial serial ) : base( serial ) { } - + public override void Serialize( GenericWriter writer ) { base.Serialize( writer ); writer.Write( (int) 0 ); } - + public override void Deserialize(GenericReader reader) { base.Deserialize( reader ); int version = reader.ReadInt(); } } -} \ No newline at end of file +} diff --git a/Scripts/Items/Armor/Plate/PlateHatsuburi.cs b/Scripts/Items/Armor/Plate/PlateHatsuburi.cs index c9126dba4..1929fe2a4 100644 --- a/Scripts/Items/Armor/Plate/PlateHatsuburi.cs +++ b/Scripts/Items/Armor/Plate/PlateHatsuburi.cs @@ -5,21 +5,21 @@ namespace Server.Items { public class PlateHatsuburi : BaseArmor { - public override int BasePhysicalResistance{ get{ return 5; } } - public override int BaseFireResistance{ get{ return 3; } } - public override int BaseColdResistance{ get{ return 2; } } - public override int BasePoisonResistance{ get{ return 2; } } - public override int BaseEnergyResistance{ get{ return 3; } } + public override int BasePhysicalResistance => 5; + public override int BaseFireResistance => 3; + public override int BaseColdResistance => 2; + public override int BasePoisonResistance => 2; + public override int BaseEnergyResistance => 3; - public override int InitMinHits{ get{ return 55; } } - public override int InitMaxHits{ get{ return 75; } } + public override int InitMinHits => 55; + public override int InitMaxHits => 75; - public override int AosStrReq{ get{ return 65; } } - public override int OldStrReq{ get{ return 65; } } + public override int AosStrReq => 65; + public override int OldStrReq => 65; - public override int ArmorBase{ get{ return 4; } } + public override int ArmorBase => 4; - public override ArmorMaterialType MaterialType{ get{ return ArmorMaterialType.Plate; } } + public override ArmorMaterialType MaterialType => ArmorMaterialType.Plate; [Constructible] public PlateHatsuburi() : base( 0x2775 ) @@ -30,17 +30,17 @@ namespace Server.Items public PlateHatsuburi( Serial serial ) : base( serial ) { } - + public override void Serialize( GenericWriter writer ) { base.Serialize( writer ); writer.Write( (int) 0 ); } - + public override void Deserialize(GenericReader reader) { base.Deserialize( reader ); int version = reader.ReadInt(); } } -} \ No newline at end of file +} diff --git a/Scripts/Items/Armor/Plate/PlateHiroSode.cs b/Scripts/Items/Armor/Plate/PlateHiroSode.cs index b8124bfe4..3ca127085 100644 --- a/Scripts/Items/Armor/Plate/PlateHiroSode.cs +++ b/Scripts/Items/Armor/Plate/PlateHiroSode.cs @@ -5,21 +5,21 @@ namespace Server.Items { public class PlateHiroSode : BaseArmor { - public override int BasePhysicalResistance{ get{ return 5; } } - public override int BaseFireResistance{ get{ return 3; } } - public override int BaseColdResistance{ get{ return 2; } } - public override int BasePoisonResistance{ get{ return 3; } } - public override int BaseEnergyResistance{ get{ return 2; } } + public override int BasePhysicalResistance => 5; + public override int BaseFireResistance => 3; + public override int BaseColdResistance => 2; + public override int BasePoisonResistance => 3; + public override int BaseEnergyResistance => 2; - public override int InitMinHits{ get{ return 55; } } - public override int InitMaxHits{ get{ return 75; } } + public override int InitMinHits => 55; + public override int InitMaxHits => 75; - public override int AosStrReq{ get{ return 75; } } - public override int OldStrReq{ get{ return 75; } } + public override int AosStrReq => 75; + public override int OldStrReq => 75; - public override int ArmorBase{ get{ return 3; } } + public override int ArmorBase => 3; - public override ArmorMaterialType MaterialType{ get{ return ArmorMaterialType.Plate; } } + public override ArmorMaterialType MaterialType => ArmorMaterialType.Plate; [Constructible] public PlateHiroSode() : base( 0x2780 ) @@ -30,17 +30,17 @@ namespace Server.Items public PlateHiroSode( Serial serial ) : base( serial ) { } - + public override void Serialize( GenericWriter writer ) { base.Serialize( writer ); writer.Write( (int) 0 ); } - + public override void Deserialize(GenericReader reader) { base.Deserialize( reader ); int version = reader.ReadInt(); } } -} \ No newline at end of file +} diff --git a/Scripts/Items/Armor/Plate/PlateLegs.cs b/Scripts/Items/Armor/Plate/PlateLegs.cs index f158aa51a..8f29985d4 100644 --- a/Scripts/Items/Armor/Plate/PlateLegs.cs +++ b/Scripts/Items/Armor/Plate/PlateLegs.cs @@ -6,23 +6,23 @@ namespace Server.Items [FlippableAttribute( 0x1411, 0x141a )] public class PlateLegs : BaseArmor { - public override int BasePhysicalResistance{ get{ return 5; } } - public override int BaseFireResistance{ get{ return 3; } } - public override int BaseColdResistance{ get{ return 2; } } - public override int BasePoisonResistance{ get{ return 3; } } - public override int BaseEnergyResistance{ get{ return 2; } } + public override int BasePhysicalResistance => 5; + public override int BaseFireResistance => 3; + public override int BaseColdResistance => 2; + public override int BasePoisonResistance => 3; + public override int BaseEnergyResistance => 2; - public override int InitMinHits{ get{ return 50; } } - public override int InitMaxHits{ get{ return 65; } } + public override int InitMinHits => 50; + public override int InitMaxHits => 65; - public override int AosStrReq{ get{ return 90; } } + public override int AosStrReq => 90; - public override int OldStrReq{ get{ return 60; } } - public override int OldDexBonus{ get{ return -6; } } + public override int OldStrReq => 60; + public override int OldDexBonus => -6; - public override int ArmorBase{ get{ return 40; } } + public override int ArmorBase => 40; - public override ArmorMaterialType MaterialType{ get{ return ArmorMaterialType.Plate; } } + public override ArmorMaterialType MaterialType => ArmorMaterialType.Plate; [Constructible] public PlateLegs() : base( 0x1411 ) @@ -33,17 +33,17 @@ namespace Server.Items public PlateLegs( Serial serial ) : base( serial ) { } - + public override void Serialize( GenericWriter writer ) { base.Serialize( writer ); writer.Write( (int) 0 ); } - + public override void Deserialize(GenericReader reader) { base.Deserialize( reader ); int version = reader.ReadInt(); } } -} \ No newline at end of file +} diff --git a/Scripts/Items/Armor/Plate/PlateMempo.cs b/Scripts/Items/Armor/Plate/PlateMempo.cs index 75d22ac19..328421b76 100644 --- a/Scripts/Items/Armor/Plate/PlateMempo.cs +++ b/Scripts/Items/Armor/Plate/PlateMempo.cs @@ -5,21 +5,21 @@ namespace Server.Items { public class PlateMempo : BaseArmor { - public override int BasePhysicalResistance{ get{ return 5; } } - public override int BaseFireResistance{ get{ return 3; } } - public override int BaseColdResistance{ get{ return 2; } } - public override int BasePoisonResistance{ get{ return 3; } } - public override int BaseEnergyResistance{ get{ return 2; } } + public override int BasePhysicalResistance => 5; + public override int BaseFireResistance => 3; + public override int BaseColdResistance => 2; + public override int BasePoisonResistance => 3; + public override int BaseEnergyResistance => 2; - public override int InitMinHits{ get{ return 60; } } - public override int InitMaxHits{ get{ return 70; } } + public override int InitMinHits => 60; + public override int InitMaxHits => 70; - public override int AosStrReq{ get{ return 50; } } - public override int OldStrReq{ get{ return 50; } } + public override int AosStrReq => 50; + public override int OldStrReq => 50; - public override int ArmorBase{ get{ return 4; } } + public override int ArmorBase => 4; - public override ArmorMaterialType MaterialType{ get{ return ArmorMaterialType.Plate; } } + public override ArmorMaterialType MaterialType => ArmorMaterialType.Plate; [Constructible] public PlateMempo() : base( 0x2779 ) @@ -30,17 +30,17 @@ namespace Server.Items public PlateMempo( Serial serial ) : base( serial ) { } - + public override void Serialize( GenericWriter writer ) { base.Serialize( writer ); writer.Write( (int) 0 ); } - + public override void Deserialize(GenericReader reader) { base.Deserialize( reader ); int version = reader.ReadInt(); } } -} \ No newline at end of file +} diff --git a/Scripts/Items/Armor/Plate/PlateSuneate.cs b/Scripts/Items/Armor/Plate/PlateSuneate.cs index 9b13183f1..33b403aa7 100644 --- a/Scripts/Items/Armor/Plate/PlateSuneate.cs +++ b/Scripts/Items/Armor/Plate/PlateSuneate.cs @@ -5,21 +5,21 @@ namespace Server.Items { public class PlateSuneate : BaseArmor { - public override int BasePhysicalResistance{ get{ return 5; } } - public override int BaseFireResistance{ get{ return 3; } } - public override int BaseColdResistance{ get{ return 2; } } - public override int BasePoisonResistance{ get{ return 3; } } - public override int BaseEnergyResistance{ get{ return 2; } } + public override int BasePhysicalResistance => 5; + public override int BaseFireResistance => 3; + public override int BaseColdResistance => 2; + public override int BasePoisonResistance => 3; + public override int BaseEnergyResistance => 2; - public override int InitMinHits{ get{ return 55; } } - public override int InitMaxHits{ get{ return 65; } } + public override int InitMinHits => 55; + public override int InitMaxHits => 65; - public override int AosStrReq{ get{ return 80; } } - public override int OldStrReq{ get{ return 80; } } + public override int AosStrReq => 80; + public override int OldStrReq => 80; - public override int ArmorBase{ get{ return 3; } } + public override int ArmorBase => 3; - public override ArmorMaterialType MaterialType{ get{ return ArmorMaterialType.Plate; } } + public override ArmorMaterialType MaterialType => ArmorMaterialType.Plate; [Constructible] public PlateSuneate() : base( 0x2788 ) @@ -30,17 +30,17 @@ namespace Server.Items public PlateSuneate( Serial serial ) : base( serial ) { } - + public override void Serialize( GenericWriter writer ) { base.Serialize( writer ); writer.Write( (int) 0 ); } - + public override void Deserialize(GenericReader reader) { base.Deserialize( reader ); int version = reader.ReadInt(); } } -} \ No newline at end of file +} diff --git a/Scripts/Items/Armor/Plate/SmallPlateJingasa.cs b/Scripts/Items/Armor/Plate/SmallPlateJingasa.cs index 750ba5e81..ae1433553 100644 --- a/Scripts/Items/Armor/Plate/SmallPlateJingasa.cs +++ b/Scripts/Items/Armor/Plate/SmallPlateJingasa.cs @@ -5,21 +5,21 @@ namespace Server.Items { public class SmallPlateJingasa : BaseArmor { - public override int BasePhysicalResistance{ get{ return 7; } } - public override int BaseFireResistance{ get{ return 2; } } - public override int BaseColdResistance{ get{ return 2; } } - public override int BasePoisonResistance{ get{ return 2; } } - public override int BaseEnergyResistance{ get{ return 2; } } + public override int BasePhysicalResistance => 7; + public override int BaseFireResistance => 2; + public override int BaseColdResistance => 2; + public override int BasePoisonResistance => 2; + public override int BaseEnergyResistance => 2; - public override int InitMinHits{ get{ return 55; } } - public override int InitMaxHits{ get{ return 60; } } + public override int InitMinHits => 55; + public override int InitMaxHits => 60; - public override int AosStrReq{ get{ return 55; } } - public override int OldStrReq{ get{ return 55; } } + public override int AosStrReq => 55; + public override int OldStrReq => 55; - public override int ArmorBase{ get{ return 4; } } + public override int ArmorBase => 4; - public override ArmorMaterialType MaterialType{ get{ return ArmorMaterialType.Plate; } } + public override ArmorMaterialType MaterialType => ArmorMaterialType.Plate; [Constructible] public SmallPlateJingasa() : base( 0x2784 ) @@ -30,17 +30,17 @@ namespace Server.Items public SmallPlateJingasa( Serial serial ) : base( serial ) { } - + public override void Serialize( GenericWriter writer ) { base.Serialize( writer ); writer.Write( (int) 0 ); } - + public override void Deserialize(GenericReader reader) { base.Deserialize( reader ); int version = reader.ReadInt(); } } -} \ No newline at end of file +} diff --git a/Scripts/Items/Armor/Plate/StandardPlateKabuto.cs b/Scripts/Items/Armor/Plate/StandardPlateKabuto.cs index 635f92e14..62dc89fd0 100644 --- a/Scripts/Items/Armor/Plate/StandardPlateKabuto.cs +++ b/Scripts/Items/Armor/Plate/StandardPlateKabuto.cs @@ -5,21 +5,21 @@ namespace Server.Items { public class StandardPlateKabuto : BaseArmor { - public override int BasePhysicalResistance{ get{ return 6; } } - public override int BaseFireResistance{ get{ return 2; } } - public override int BaseColdResistance{ get{ return 2; } } - public override int BasePoisonResistance{ get{ return 2; } } - public override int BaseEnergyResistance{ get{ return 3; } } + public override int BasePhysicalResistance => 6; + public override int BaseFireResistance => 2; + public override int BaseColdResistance => 2; + public override int BasePoisonResistance => 2; + public override int BaseEnergyResistance => 3; - public override int InitMinHits{ get{ return 60; } } - public override int InitMaxHits{ get{ return 65; } } + public override int InitMinHits => 60; + public override int InitMaxHits => 65; - public override int AosStrReq{ get{ return 70; } } - public override int OldStrReq{ get{ return 70; } } + public override int AosStrReq => 70; + public override int OldStrReq => 70; - public override int ArmorBase{ get{ return 3; } } + public override int ArmorBase => 3; - public override ArmorMaterialType MaterialType{ get{ return ArmorMaterialType.Plate; } } + public override ArmorMaterialType MaterialType => ArmorMaterialType.Plate; [Constructible] public StandardPlateKabuto() : base( 0x2789 ) @@ -30,17 +30,17 @@ namespace Server.Items public StandardPlateKabuto( Serial serial ) : base( serial ) { } - + public override void Serialize( GenericWriter writer ) { base.Serialize( writer ); writer.Write( (int) 0 ); } - + public override void Deserialize(GenericReader reader) { base.Deserialize( reader ); int version = reader.ReadInt(); } } -} \ No newline at end of file +} diff --git a/Scripts/Items/Armor/Plate/WoodlandArms.cs b/Scripts/Items/Armor/Plate/WoodlandArms.cs index d64f6427f..86e7ce46f 100644 --- a/Scripts/Items/Armor/Plate/WoodlandArms.cs +++ b/Scripts/Items/Armor/Plate/WoodlandArms.cs @@ -6,22 +6,22 @@ namespace Server.Items [FlippableAttribute( 0x2B6C, 0x3163 )] public class WoodlandArms : BaseArmor { - public override int BasePhysicalResistance{ get{ return 5; } } - public override int BaseFireResistance{ get{ return 3; } } - public override int BaseColdResistance{ get{ return 2; } } - public override int BasePoisonResistance{ get{ return 3; } } - public override int BaseEnergyResistance{ get{ return 2; } } + public override int BasePhysicalResistance => 5; + public override int BaseFireResistance => 3; + public override int BaseColdResistance => 2; + public override int BasePoisonResistance => 3; + public override int BaseEnergyResistance => 2; - public override int InitMinHits{ get{ return 50; } } - public override int InitMaxHits{ get{ return 65; } } + public override int InitMinHits => 50; + public override int InitMaxHits => 65; - public override int AosStrReq{ get{ return 80; } } - public override int OldStrReq{ get{ return 80; } } + public override int AosStrReq => 80; + public override int OldStrReq => 80; - public override int ArmorBase{ get{ return 40; } } + public override int ArmorBase => 40; - public override ArmorMaterialType MaterialType{ get{ return ArmorMaterialType.Plate; } } - public override Race RequiredRace { get { return Race.Elf; } } + public override ArmorMaterialType MaterialType => ArmorMaterialType.Plate; + public override Race RequiredRace => Race.Elf; [Constructible] public WoodlandArms() : base( 0x2B6C ) @@ -47,4 +47,4 @@ namespace Server.Items int version = reader.ReadEncodedInt(); } } -} \ No newline at end of file +} diff --git a/Scripts/Items/Armor/Plate/WoodlandChest.cs b/Scripts/Items/Armor/Plate/WoodlandChest.cs index ab897d7e5..6ac45c711 100644 --- a/Scripts/Items/Armor/Plate/WoodlandChest.cs +++ b/Scripts/Items/Armor/Plate/WoodlandChest.cs @@ -6,22 +6,22 @@ namespace Server.Items [FlippableAttribute( 0x2B67, 0x315E )] public class WoodlandChest : BaseArmor { - public override int BasePhysicalResistance{ get{ return 5; } } - public override int BaseFireResistance{ get{ return 3; } } - public override int BaseColdResistance{ get{ return 2; } } - public override int BasePoisonResistance{ get{ return 3; } } - public override int BaseEnergyResistance{ get{ return 2; } } + public override int BasePhysicalResistance => 5; + public override int BaseFireResistance => 3; + public override int BaseColdResistance => 2; + public override int BasePoisonResistance => 3; + public override int BaseEnergyResistance => 2; - public override int InitMinHits{ get{ return 50; } } - public override int InitMaxHits{ get{ return 65; } } + public override int InitMinHits => 50; + public override int InitMaxHits => 65; - public override int AosStrReq{ get{ return 95; } } - public override int OldStrReq{ get{ return 95; } } + public override int AosStrReq => 95; + public override int OldStrReq => 95; - public override int ArmorBase{ get{ return 40; } } + public override int ArmorBase => 40; - public override ArmorMaterialType MaterialType{ get{ return ArmorMaterialType.Plate; } } - public override Race RequiredRace { get { return Race.Elf; } } + public override ArmorMaterialType MaterialType => ArmorMaterialType.Plate; + public override Race RequiredRace => Race.Elf; [Constructible] public WoodlandChest() : base( 0x2B67 ) @@ -47,4 +47,4 @@ namespace Server.Items int version = reader.ReadEncodedInt(); } } -} \ No newline at end of file +} diff --git a/Scripts/Items/Armor/Plate/WoodlandGloves.cs b/Scripts/Items/Armor/Plate/WoodlandGloves.cs index ffa3f3cce..c32038df3 100644 --- a/Scripts/Items/Armor/Plate/WoodlandGloves.cs +++ b/Scripts/Items/Armor/Plate/WoodlandGloves.cs @@ -6,22 +6,22 @@ namespace Server.Items [FlippableAttribute( 0x2B6A, 0x3161 )] public class WoodlandGloves : BaseArmor { - public override int BasePhysicalResistance{ get{ return 5; } } - public override int BaseFireResistance{ get{ return 3; } } - public override int BaseColdResistance{ get{ return 2; } } - public override int BasePoisonResistance{ get{ return 3; } } - public override int BaseEnergyResistance{ get{ return 2; } } + public override int BasePhysicalResistance => 5; + public override int BaseFireResistance => 3; + public override int BaseColdResistance => 2; + public override int BasePoisonResistance => 3; + public override int BaseEnergyResistance => 2; - public override int InitMinHits{ get{ return 50; } } - public override int InitMaxHits{ get{ return 65; } } + public override int InitMinHits => 50; + public override int InitMaxHits => 65; - public override int AosStrReq{ get{ return 70; } } - public override int OldStrReq{ get{ return 70; } } + public override int AosStrReq => 70; + public override int OldStrReq => 70; - public override int ArmorBase{ get{ return 40; } } + public override int ArmorBase => 40; - public override ArmorMaterialType MaterialType{ get{ return ArmorMaterialType.Plate; } } - public override Race RequiredRace { get { return Race.Elf; } } + public override ArmorMaterialType MaterialType => ArmorMaterialType.Plate; + public override Race RequiredRace => Race.Elf; [Constructible] public WoodlandGloves() : base( 0x2B6A ) @@ -47,4 +47,4 @@ namespace Server.Items int version = reader.ReadEncodedInt(); } } -} \ No newline at end of file +} diff --git a/Scripts/Items/Armor/Plate/WoodlandGorget.cs b/Scripts/Items/Armor/Plate/WoodlandGorget.cs index 57ebcf8f8..db561a00d 100644 --- a/Scripts/Items/Armor/Plate/WoodlandGorget.cs +++ b/Scripts/Items/Armor/Plate/WoodlandGorget.cs @@ -6,22 +6,22 @@ namespace Server.Items [FlippableAttribute( 0x2B69, 0x3160 )] public class WoodlandGorget : BaseArmor { - public override int BasePhysicalResistance{ get{ return 5; } } - public override int BaseFireResistance{ get{ return 3; } } - public override int BaseColdResistance{ get{ return 2; } } - public override int BasePoisonResistance{ get{ return 3; } } - public override int BaseEnergyResistance{ get{ return 2; } } + public override int BasePhysicalResistance => 5; + public override int BaseFireResistance => 3; + public override int BaseColdResistance => 2; + public override int BasePoisonResistance => 3; + public override int BaseEnergyResistance => 2; - public override int InitMinHits{ get{ return 50; } } - public override int InitMaxHits{ get{ return 65; } } + public override int InitMinHits => 50; + public override int InitMaxHits => 65; - public override int AosStrReq{ get{ return 45; } } - public override int OldStrReq{ get{ return 45; } } + public override int AosStrReq => 45; + public override int OldStrReq => 45; - public override int ArmorBase{ get{ return 40; } } + public override int ArmorBase => 40; - public override ArmorMaterialType MaterialType{ get{ return ArmorMaterialType.Plate; } } - public override Race RequiredRace { get { return Race.Elf; } } + public override ArmorMaterialType MaterialType => ArmorMaterialType.Plate; + public override Race RequiredRace => Race.Elf; [Constructible] public WoodlandGorget() : base( 0x2B69 ) @@ -49,4 +49,4 @@ namespace Server.Items Weight = -1; } } -} \ No newline at end of file +} diff --git a/Scripts/Items/Armor/Plate/WoodlandLegs.cs b/Scripts/Items/Armor/Plate/WoodlandLegs.cs index 4125c8813..9ebc282fd 100644 --- a/Scripts/Items/Armor/Plate/WoodlandLegs.cs +++ b/Scripts/Items/Armor/Plate/WoodlandLegs.cs @@ -6,22 +6,22 @@ namespace Server.Items [FlippableAttribute( 0x2B6B, 0x3162 )] public class WoodlandLegs : BaseArmor { - public override int BasePhysicalResistance{ get{ return 5; } } - public override int BaseFireResistance{ get{ return 3; } } - public override int BaseColdResistance{ get{ return 2; } } - public override int BasePoisonResistance{ get{ return 3; } } - public override int BaseEnergyResistance{ get{ return 2; } } + public override int BasePhysicalResistance => 5; + public override int BaseFireResistance => 3; + public override int BaseColdResistance => 2; + public override int BasePoisonResistance => 3; + public override int BaseEnergyResistance => 2; - public override int InitMinHits{ get{ return 50; } } - public override int InitMaxHits{ get{ return 65; } } + public override int InitMinHits => 50; + public override int InitMaxHits => 65; - public override int AosStrReq{ get{ return 90; } } - public override int OldStrReq{ get{ return 90; } } + public override int AosStrReq => 90; + public override int OldStrReq => 90; - public override int ArmorBase{ get{ return 40; } } + public override int ArmorBase => 40; - public override ArmorMaterialType MaterialType{ get{ return ArmorMaterialType.Plate; } } - public override Race RequiredRace { get { return Race.Elf; } } + public override ArmorMaterialType MaterialType => ArmorMaterialType.Plate; + public override Race RequiredRace => Race.Elf; [Constructible] public WoodlandLegs() : base( 0x2B6B ) @@ -47,4 +47,4 @@ namespace Server.Items int version = reader.ReadEncodedInt(); } } -} \ No newline at end of file +} diff --git a/Scripts/Items/Armor/Ranger/RangerArms.cs b/Scripts/Items/Armor/Ranger/RangerArms.cs index bf3dd3958..0838b28e6 100644 --- a/Scripts/Items/Armor/Ranger/RangerArms.cs +++ b/Scripts/Items/Armor/Ranger/RangerArms.cs @@ -6,24 +6,24 @@ namespace Server.Items [FlippableAttribute( 0x13dc, 0x13d4 )] public class RangerArms : BaseArmor { - public override int BasePhysicalResistance{ get{ return 2; } } - public override int BaseFireResistance{ get{ return 4; } } - public override int BaseColdResistance{ get{ return 3; } } - public override int BasePoisonResistance{ get{ return 3; } } - public override int BaseEnergyResistance{ get{ return 4; } } + public override int BasePhysicalResistance => 2; + public override int BaseFireResistance => 4; + public override int BaseColdResistance => 3; + public override int BasePoisonResistance => 3; + public override int BaseEnergyResistance => 4; - public override int InitMinHits{ get{ return 35; } } - public override int InitMaxHits{ get{ return 45; } } + public override int InitMinHits => 35; + public override int InitMaxHits => 45; - public override int AosStrReq{ get{ return 25; } } - public override int OldStrReq{ get{ return 25; } } + public override int AosStrReq => 25; + public override int OldStrReq => 25; - public override int ArmorBase{ get{ return 16; } } + public override int ArmorBase => 16; - public override ArmorMaterialType MaterialType{ get{ return ArmorMaterialType.Studded; } } - public override CraftResource DefaultResource{ get{ return CraftResource.RegularLeather; } } + public override ArmorMaterialType MaterialType => ArmorMaterialType.Studded; + public override CraftResource DefaultResource => CraftResource.RegularLeather; - public override int LabelNumber{ get{ return 1041493; } } // studded sleeves, ranger armor + public override int LabelNumber => 1041493; // studded sleeves, ranger armor [Constructible] public RangerArms() : base( 0x13DC ) @@ -35,13 +35,13 @@ namespace Server.Items public RangerArms( Serial serial ) : base( serial ) { } - + public override void Serialize( GenericWriter writer ) { base.Serialize( writer ); writer.Write( (int) 0 ); } - + public override void Deserialize(GenericReader reader) { base.Deserialize( reader ); @@ -51,4 +51,4 @@ namespace Server.Items Weight = 4.0; } } -} \ No newline at end of file +} diff --git a/Scripts/Items/Armor/Ranger/RangerChest.cs b/Scripts/Items/Armor/Ranger/RangerChest.cs index 99eb79b75..bd67b9ed0 100644 --- a/Scripts/Items/Armor/Ranger/RangerChest.cs +++ b/Scripts/Items/Armor/Ranger/RangerChest.cs @@ -6,24 +6,24 @@ namespace Server.Items [FlippableAttribute( 0x13db, 0x13e2 )] public class RangerChest : BaseArmor { - public override int BasePhysicalResistance{ get{ return 2; } } - public override int BaseFireResistance{ get{ return 4; } } - public override int BaseColdResistance{ get{ return 3; } } - public override int BasePoisonResistance{ get{ return 3; } } - public override int BaseEnergyResistance{ get{ return 4; } } + public override int BasePhysicalResistance => 2; + public override int BaseFireResistance => 4; + public override int BaseColdResistance => 3; + public override int BasePoisonResistance => 3; + public override int BaseEnergyResistance => 4; - public override int InitMinHits{ get{ return 35; } } - public override int InitMaxHits{ get{ return 45; } } + public override int InitMinHits => 35; + public override int InitMaxHits => 45; - public override int AosStrReq{ get{ return 35; } } - public override int OldStrReq{ get{ return 35; } } + public override int AosStrReq => 35; + public override int OldStrReq => 35; - public override int ArmorBase{ get{ return 16; } } + public override int ArmorBase => 16; - public override ArmorMaterialType MaterialType{ get{ return ArmorMaterialType.Studded; } } - public override CraftResource DefaultResource{ get{ return CraftResource.RegularLeather; } } + public override ArmorMaterialType MaterialType => ArmorMaterialType.Studded; + public override CraftResource DefaultResource => CraftResource.RegularLeather; - public override int LabelNumber{ get{ return 1041497; } } // studded tunic, ranger armor + public override int LabelNumber => 1041497; // studded tunic, ranger armor [Constructible] public RangerChest() : base( 0x13DB ) @@ -35,13 +35,13 @@ namespace Server.Items public RangerChest( Serial serial ) : base( serial ) { } - + public override void Serialize( GenericWriter writer ) { base.Serialize( writer ); writer.Write( (int) 0 ); } - + public override void Deserialize(GenericReader reader) { base.Deserialize( reader ); @@ -51,4 +51,4 @@ namespace Server.Items Weight = 8.0; } } -} \ No newline at end of file +} diff --git a/Scripts/Items/Armor/Ranger/RangerGloves.cs b/Scripts/Items/Armor/Ranger/RangerGloves.cs index 6dfe6fef5..bd8eac7a5 100644 --- a/Scripts/Items/Armor/Ranger/RangerGloves.cs +++ b/Scripts/Items/Armor/Ranger/RangerGloves.cs @@ -6,24 +6,24 @@ namespace Server.Items [FlippableAttribute( 0x13d5, 0x13dd )] public class RangerGloves : BaseArmor { - public override int BasePhysicalResistance{ get{ return 2; } } - public override int BaseFireResistance{ get{ return 4; } } - public override int BaseColdResistance{ get{ return 3; } } - public override int BasePoisonResistance{ get{ return 3; } } - public override int BaseEnergyResistance{ get{ return 4; } } + public override int BasePhysicalResistance => 2; + public override int BaseFireResistance => 4; + public override int BaseColdResistance => 3; + public override int BasePoisonResistance => 3; + public override int BaseEnergyResistance => 4; - public override int InitMinHits{ get{ return 35; } } - public override int InitMaxHits{ get{ return 45; } } + public override int InitMinHits => 35; + public override int InitMaxHits => 45; - public override int AosStrReq{ get{ return 25; } } - public override int OldStrReq{ get{ return 25; } } + public override int AosStrReq => 25; + public override int OldStrReq => 25; - public override int ArmorBase{ get{ return 16; } } + public override int ArmorBase => 16; - public override ArmorMaterialType MaterialType{ get{ return ArmorMaterialType.Studded; } } - public override CraftResource DefaultResource{ get{ return CraftResource.RegularLeather; } } + public override ArmorMaterialType MaterialType => ArmorMaterialType.Studded; + public override CraftResource DefaultResource => CraftResource.RegularLeather; - public override int LabelNumber{ get{ return 1041494; } } // studded gloves, ranger armor + public override int LabelNumber => 1041494; // studded gloves, ranger armor [Constructible] public RangerGloves() : base( 0x13D5 ) @@ -35,17 +35,17 @@ namespace Server.Items public RangerGloves( Serial serial ) : base( serial ) { } - + public override void Serialize( GenericWriter writer ) { base.Serialize( writer ); writer.Write( (int) 0 ); } - + public override void Deserialize(GenericReader reader) { base.Deserialize( reader ); int version = reader.ReadInt(); } } -} \ No newline at end of file +} diff --git a/Scripts/Items/Armor/Ranger/RangerGorget.cs b/Scripts/Items/Armor/Ranger/RangerGorget.cs index 36d1933de..98f1bc08c 100644 --- a/Scripts/Items/Armor/Ranger/RangerGorget.cs +++ b/Scripts/Items/Armor/Ranger/RangerGorget.cs @@ -5,24 +5,24 @@ namespace Server.Items { public class RangerGorget : BaseArmor { - public override int BasePhysicalResistance{ get{ return 2; } } - public override int BaseFireResistance{ get{ return 4; } } - public override int BaseColdResistance{ get{ return 3; } } - public override int BasePoisonResistance{ get{ return 3; } } - public override int BaseEnergyResistance{ get{ return 4; } } + public override int BasePhysicalResistance => 2; + public override int BaseFireResistance => 4; + public override int BaseColdResistance => 3; + public override int BasePoisonResistance => 3; + public override int BaseEnergyResistance => 4; - public override int InitMinHits{ get{ return 35; } } - public override int InitMaxHits{ get{ return 45; } } + public override int InitMinHits => 35; + public override int InitMaxHits => 45; - public override int AosStrReq{ get{ return 25; } } - public override int OldStrReq{ get{ return 25; } } + public override int AosStrReq => 25; + public override int OldStrReq => 25; - public override int ArmorBase{ get{ return 16; } } + public override int ArmorBase => 16; - public override ArmorMaterialType MaterialType{ get{ return ArmorMaterialType.Studded; } } - public override CraftResource DefaultResource{ get{ return CraftResource.RegularLeather; } } + public override ArmorMaterialType MaterialType => ArmorMaterialType.Studded; + public override CraftResource DefaultResource => CraftResource.RegularLeather; - public override int LabelNumber{ get{ return 1041495; } } // studded gorget, ranger armor + public override int LabelNumber => 1041495; // studded gorget, ranger armor [Constructible] public RangerGorget() : base( 0x13D6 ) @@ -34,17 +34,17 @@ namespace Server.Items public RangerGorget( Serial serial ) : base( serial ) { } - + public override void Serialize( GenericWriter writer ) { base.Serialize( writer ); writer.Write( (int) 0 ); } - + public override void Deserialize(GenericReader reader) { base.Deserialize( reader ); int version = reader.ReadInt(); } } -} \ No newline at end of file +} diff --git a/Scripts/Items/Armor/Ranger/RangerLegs.cs b/Scripts/Items/Armor/Ranger/RangerLegs.cs index bcb150cd5..7987e00b2 100644 --- a/Scripts/Items/Armor/Ranger/RangerLegs.cs +++ b/Scripts/Items/Armor/Ranger/RangerLegs.cs @@ -6,24 +6,24 @@ namespace Server.Items [FlippableAttribute( 0x13da, 0x13e1 )] public class RangerLegs : BaseArmor { - public override int BasePhysicalResistance{ get{ return 2; } } - public override int BaseFireResistance{ get{ return 4; } } - public override int BaseColdResistance{ get{ return 3; } } - public override int BasePoisonResistance{ get{ return 3; } } - public override int BaseEnergyResistance{ get{ return 4; } } + public override int BasePhysicalResistance => 2; + public override int BaseFireResistance => 4; + public override int BaseColdResistance => 3; + public override int BasePoisonResistance => 3; + public override int BaseEnergyResistance => 4; - public override int InitMinHits{ get{ return 35; } } - public override int InitMaxHits{ get{ return 45; } } + public override int InitMinHits => 35; + public override int InitMaxHits => 45; - public override int AosStrReq{ get{ return 30; } } - public override int OldStrReq{ get{ return 35; } } + public override int AosStrReq => 30; + public override int OldStrReq => 35; - public override int ArmorBase{ get{ return 16; } } + public override int ArmorBase => 16; - public override ArmorMaterialType MaterialType{ get{ return ArmorMaterialType.Studded; } } - public override CraftResource DefaultResource{ get{ return CraftResource.RegularLeather; } } + public override ArmorMaterialType MaterialType => ArmorMaterialType.Studded; + public override CraftResource DefaultResource => CraftResource.RegularLeather; - public override int LabelNumber{ get{ return 1041496; } } // studded leggings, ranger armor + public override int LabelNumber => 1041496; // studded leggings, ranger armor [Constructible] public RangerLegs() : base( 0x13DA ) @@ -35,13 +35,13 @@ namespace Server.Items public RangerLegs( Serial serial ) : base( serial ) { } - + public override void Serialize( GenericWriter writer ) { base.Serialize( writer ); writer.Write( (int) 0 ); } - + public override void Deserialize(GenericReader reader) { base.Deserialize( reader ); @@ -51,4 +51,4 @@ namespace Server.Items Weight = 5.0; } } -} \ No newline at end of file +} diff --git a/Scripts/Items/Armor/Ring/RingmailArms.cs b/Scripts/Items/Armor/Ring/RingmailArms.cs index c66167f59..071960727 100644 --- a/Scripts/Items/Armor/Ring/RingmailArms.cs +++ b/Scripts/Items/Armor/Ring/RingmailArms.cs @@ -6,23 +6,23 @@ namespace Server.Items [FlippableAttribute( 0x13ee, 0x13ef )] public class RingmailArms : BaseArmor { - public override int BasePhysicalResistance{ get{ return 3; } } - public override int BaseFireResistance{ get{ return 3; } } - public override int BaseColdResistance{ get{ return 1; } } - public override int BasePoisonResistance{ get{ return 5; } } - public override int BaseEnergyResistance{ get{ return 3; } } + public override int BasePhysicalResistance => 3; + public override int BaseFireResistance => 3; + public override int BaseColdResistance => 1; + public override int BasePoisonResistance => 5; + public override int BaseEnergyResistance => 3; - public override int InitMinHits{ get{ return 40; } } - public override int InitMaxHits{ get{ return 50; } } + public override int InitMinHits => 40; + public override int InitMaxHits => 50; - public override int AosStrReq{ get{ return 40; } } - public override int OldStrReq{ get{ return 20; } } + public override int AosStrReq => 40; + public override int OldStrReq => 20; - public override int OldDexBonus{ get{ return -1; } } + public override int OldDexBonus => -1; - public override int ArmorBase{ get{ return 22; } } + public override int ArmorBase => 22; - public override ArmorMaterialType MaterialType{ get{ return ArmorMaterialType.Ringmail; } } + public override ArmorMaterialType MaterialType => ArmorMaterialType.Ringmail; [Constructible] public RingmailArms() : base( 0x13EE ) @@ -33,13 +33,13 @@ namespace Server.Items public RingmailArms( Serial serial ) : base( serial ) { } - + public override void Serialize( GenericWriter writer ) { base.Serialize( writer ); writer.Write( (int) 0 ); } - + public override void Deserialize(GenericReader reader) { base.Deserialize( reader ); @@ -49,4 +49,4 @@ namespace Server.Items Weight = 15.0; } } -} \ No newline at end of file +} diff --git a/Scripts/Items/Armor/Ring/RingmailChest.cs b/Scripts/Items/Armor/Ring/RingmailChest.cs index 2615e4e85..076522fe0 100644 --- a/Scripts/Items/Armor/Ring/RingmailChest.cs +++ b/Scripts/Items/Armor/Ring/RingmailChest.cs @@ -6,23 +6,23 @@ namespace Server.Items [FlippableAttribute( 0x13ec, 0x13ed )] public class RingmailChest : BaseArmor { - public override int BasePhysicalResistance{ get{ return 3; } } - public override int BaseFireResistance{ get{ return 3; } } - public override int BaseColdResistance{ get{ return 1; } } - public override int BasePoisonResistance{ get{ return 5; } } - public override int BaseEnergyResistance{ get{ return 3; } } + public override int BasePhysicalResistance => 3; + public override int BaseFireResistance => 3; + public override int BaseColdResistance => 1; + public override int BasePoisonResistance => 5; + public override int BaseEnergyResistance => 3; - public override int InitMinHits{ get{ return 40; } } - public override int InitMaxHits{ get{ return 50; } } + public override int InitMinHits => 40; + public override int InitMaxHits => 50; - public override int AosStrReq{ get{ return 40; } } - public override int OldStrReq{ get{ return 20; } } + public override int AosStrReq => 40; + public override int OldStrReq => 20; - public override int OldDexBonus{ get{ return -2; } } + public override int OldDexBonus => -2; - public override int ArmorBase{ get{ return 22; } } + public override int ArmorBase => 22; - public override ArmorMaterialType MaterialType{ get{ return ArmorMaterialType.Ringmail; } } + public override ArmorMaterialType MaterialType => ArmorMaterialType.Ringmail; [Constructible] public RingmailChest() : base( 0x13EC ) @@ -33,13 +33,13 @@ namespace Server.Items public RingmailChest( Serial serial ) : base( serial ) { } - + public override void Serialize( GenericWriter writer ) { base.Serialize( writer ); writer.Write( (int) 0 ); } - + public override void Deserialize(GenericReader reader) { base.Deserialize( reader ); @@ -49,4 +49,4 @@ namespace Server.Items Weight = 15.0; } } -} \ No newline at end of file +} diff --git a/Scripts/Items/Armor/Ring/RingmailGloves.cs b/Scripts/Items/Armor/Ring/RingmailGloves.cs index 8e2df5dc7..c96db49cb 100644 --- a/Scripts/Items/Armor/Ring/RingmailGloves.cs +++ b/Scripts/Items/Armor/Ring/RingmailGloves.cs @@ -6,23 +6,23 @@ namespace Server.Items [FlippableAttribute( 0x13eb, 0x13f2 )] public class RingmailGloves : BaseArmor { - public override int BasePhysicalResistance{ get{ return 3; } } - public override int BaseFireResistance{ get{ return 3; } } - public override int BaseColdResistance{ get{ return 1; } } - public override int BasePoisonResistance{ get{ return 5; } } - public override int BaseEnergyResistance{ get{ return 3; } } + public override int BasePhysicalResistance => 3; + public override int BaseFireResistance => 3; + public override int BaseColdResistance => 1; + public override int BasePoisonResistance => 5; + public override int BaseEnergyResistance => 3; - public override int InitMinHits{ get{ return 40; } } - public override int InitMaxHits{ get{ return 50; } } + public override int InitMinHits => 40; + public override int InitMaxHits => 50; - public override int AosStrReq{ get{ return 40; } } - public override int OldStrReq{ get{ return 20; } } + public override int AosStrReq => 40; + public override int OldStrReq => 20; - public override int OldDexBonus{ get{ return -1; } } + public override int OldDexBonus => -1; - public override int ArmorBase{ get{ return 22; } } + public override int ArmorBase => 22; - public override ArmorMaterialType MaterialType{ get{ return ArmorMaterialType.Ringmail; } } + public override ArmorMaterialType MaterialType => ArmorMaterialType.Ringmail; [Constructible] public RingmailGloves() : base( 0x13EB ) @@ -33,13 +33,13 @@ namespace Server.Items public RingmailGloves( Serial serial ) : base( serial ) { } - + public override void Serialize( GenericWriter writer ) { base.Serialize( writer ); writer.Write( (int) 0 ); } - + public override void Deserialize(GenericReader reader) { base.Deserialize( reader ); @@ -49,4 +49,4 @@ namespace Server.Items Weight = 2.0; } } -} \ No newline at end of file +} diff --git a/Scripts/Items/Armor/Ring/RingmailLegs.cs b/Scripts/Items/Armor/Ring/RingmailLegs.cs index 44b34de38..49943486c 100644 --- a/Scripts/Items/Armor/Ring/RingmailLegs.cs +++ b/Scripts/Items/Armor/Ring/RingmailLegs.cs @@ -6,23 +6,23 @@ namespace Server.Items [FlippableAttribute( 0x13f0, 0x13f1 )] public class RingmailLegs : BaseArmor { - public override int BasePhysicalResistance{ get{ return 3; } } - public override int BaseFireResistance{ get{ return 3; } } - public override int BaseColdResistance{ get{ return 1; } } - public override int BasePoisonResistance{ get{ return 5; } } - public override int BaseEnergyResistance{ get{ return 3; } } + public override int BasePhysicalResistance => 3; + public override int BaseFireResistance => 3; + public override int BaseColdResistance => 1; + public override int BasePoisonResistance => 5; + public override int BaseEnergyResistance => 3; - public override int InitMinHits{ get{ return 40; } } - public override int InitMaxHits{ get{ return 50; } } + public override int InitMinHits => 40; + public override int InitMaxHits => 50; - public override int AosStrReq{ get{ return 40; } } - public override int OldStrReq{ get{ return 20; } } + public override int AosStrReq => 40; + public override int OldStrReq => 20; - public override int OldDexBonus{ get{ return -1; } } + public override int OldDexBonus => -1; - public override int ArmorBase{ get{ return 22; } } + public override int ArmorBase => 22; - public override ArmorMaterialType MaterialType{ get{ return ArmorMaterialType.Ringmail; } } + public override ArmorMaterialType MaterialType => ArmorMaterialType.Ringmail; [Constructible] public RingmailLegs() : base( 0x13F0 ) @@ -33,17 +33,17 @@ namespace Server.Items public RingmailLegs( Serial serial ) : base( serial ) { } - + public override void Serialize( GenericWriter writer ) { base.Serialize( writer ); writer.Write( (int) 0 ); } - + public override void Deserialize(GenericReader reader) { base.Deserialize( reader ); int version = reader.ReadInt(); } } -} \ No newline at end of file +} diff --git a/Scripts/Items/Armor/Studded/FemaleStuddedChest.cs b/Scripts/Items/Armor/Studded/FemaleStuddedChest.cs index 0c78b4048..0472ae967 100644 --- a/Scripts/Items/Armor/Studded/FemaleStuddedChest.cs +++ b/Scripts/Items/Armor/Studded/FemaleStuddedChest.cs @@ -6,24 +6,24 @@ namespace Server.Items [FlippableAttribute( 0x1c02, 0x1c03 )] public class FemaleStuddedChest : BaseArmor { - public override int BasePhysicalResistance{ get{ return 2; } } - public override int BaseFireResistance{ get{ return 4; } } - public override int BaseColdResistance{ get{ return 3; } } - public override int BasePoisonResistance{ get{ return 3; } } - public override int BaseEnergyResistance{ get{ return 4; } } + public override int BasePhysicalResistance => 2; + public override int BaseFireResistance => 4; + public override int BaseColdResistance => 3; + public override int BasePoisonResistance => 3; + public override int BaseEnergyResistance => 4; - public override int InitMinHits{ get{ return 35; } } - public override int InitMaxHits{ get{ return 45; } } + public override int InitMinHits => 35; + public override int InitMaxHits => 45; - public override int AosStrReq{ get{ return 35; } } - public override int OldStrReq{ get{ return 35; } } + public override int AosStrReq => 35; + public override int OldStrReq => 35; - public override int ArmorBase{ get{ return 16; } } + public override int ArmorBase => 16; - public override ArmorMaterialType MaterialType{ get{ return ArmorMaterialType.Studded; } } - public override CraftResource DefaultResource{ get{ return CraftResource.RegularLeather; } } + public override ArmorMaterialType MaterialType => ArmorMaterialType.Studded; + public override CraftResource DefaultResource => CraftResource.RegularLeather; - public override ArmorMeditationAllowance DefMedAllowance{ get{ return ArmorMeditationAllowance.Half; } } + public override ArmorMeditationAllowance DefMedAllowance => ArmorMeditationAllowance.Half; public override bool AllowMaleWearer => false; diff --git a/Scripts/Items/Armor/Studded/HideChest.cs b/Scripts/Items/Armor/Studded/HideChest.cs index 07f236740..d930fcda2 100644 --- a/Scripts/Items/Armor/Studded/HideChest.cs +++ b/Scripts/Items/Armor/Studded/HideChest.cs @@ -6,26 +6,26 @@ namespace Server.Items [FlippableAttribute( 0x2B74, 0x316B )] public class HideChest : BaseArmor { - public override Race RequiredRace { get { return Race.Elf; } } + public override Race RequiredRace => Race.Elf; - public override int BasePhysicalResistance{ get{ return 3; } } - public override int BaseFireResistance{ get{ return 3; } } - public override int BaseColdResistance{ get{ return 4; } } - public override int BasePoisonResistance{ get{ return 3; } } - public override int BaseEnergyResistance{ get{ return 2; } } + public override int BasePhysicalResistance => 3; + public override int BaseFireResistance => 3; + public override int BaseColdResistance => 4; + public override int BasePoisonResistance => 3; + public override int BaseEnergyResistance => 2; - public override int InitMinHits{ get{ return 35; } } - public override int InitMaxHits{ get{ return 45; } } + public override int InitMinHits => 35; + public override int InitMaxHits => 45; - public override int AosStrReq{ get{ return 25; } } - public override int OldStrReq{ get{ return 25; } } + public override int AosStrReq => 25; + public override int OldStrReq => 25; - public override int ArmorBase{ get{ return 15; } } + public override int ArmorBase => 15; - public override ArmorMaterialType MaterialType{ get{ return ArmorMaterialType.Studded; } } - public override CraftResource DefaultResource{ get{ return CraftResource.RegularLeather; } } + public override ArmorMaterialType MaterialType => ArmorMaterialType.Studded; + public override CraftResource DefaultResource => CraftResource.RegularLeather; - public override ArmorMeditationAllowance DefMedAllowance{ get{ return ArmorMeditationAllowance.Half; } } + public override ArmorMeditationAllowance DefMedAllowance => ArmorMeditationAllowance.Half; [Constructible] public HideChest() : base( 0x2B74 ) @@ -43,7 +43,7 @@ namespace Server.Items writer.WriteEncodedInt( 0 ); } - + public override void Deserialize(GenericReader reader) { base.Deserialize( reader ); @@ -51,4 +51,4 @@ namespace Server.Items int version = reader.ReadEncodedInt(); } } -} \ No newline at end of file +} diff --git a/Scripts/Items/Armor/Studded/HideFemaleChest.cs b/Scripts/Items/Armor/Studded/HideFemaleChest.cs index a96299806..cd2d808a8 100644 --- a/Scripts/Items/Armor/Studded/HideFemaleChest.cs +++ b/Scripts/Items/Armor/Studded/HideFemaleChest.cs @@ -6,26 +6,26 @@ namespace Server.Items [FlippableAttribute( 0x2B79, 0x3170 )] public class HideFemaleChest : BaseArmor { - public override Race RequiredRace { get { return Race.Elf; } } + public override Race RequiredRace => Race.Elf; - public override int BasePhysicalResistance{ get{ return 3; } } - public override int BaseFireResistance{ get{ return 3; } } - public override int BaseColdResistance{ get{ return 4; } } - public override int BasePoisonResistance{ get{ return 3; } } - public override int BaseEnergyResistance{ get{ return 2; } } + public override int BasePhysicalResistance => 3; + public override int BaseFireResistance => 3; + public override int BaseColdResistance => 4; + public override int BasePoisonResistance => 3; + public override int BaseEnergyResistance => 2; - public override int InitMinHits{ get{ return 35; } } - public override int InitMaxHits{ get{ return 45; } } + public override int InitMinHits => 35; + public override int InitMaxHits => 45; - public override int AosStrReq{ get{ return 35; } } - public override int OldStrReq{ get{ return 35; } } + public override int AosStrReq => 35; + public override int OldStrReq => 35; - public override int ArmorBase{ get{ return 15; } } + public override int ArmorBase => 15; - public override ArmorMaterialType MaterialType{ get{ return ArmorMaterialType.Studded; } } - public override CraftResource DefaultResource{ get{ return CraftResource.RegularLeather; } } + public override ArmorMaterialType MaterialType => ArmorMaterialType.Studded; + public override CraftResource DefaultResource => CraftResource.RegularLeather; - public override ArmorMeditationAllowance DefMedAllowance{ get{ return ArmorMeditationAllowance.Half; } } + public override ArmorMeditationAllowance DefMedAllowance => ArmorMeditationAllowance.Half; public override bool AllowMaleWearer => false; diff --git a/Scripts/Items/Armor/Studded/HideGloves.cs b/Scripts/Items/Armor/Studded/HideGloves.cs index 62d6ab5ea..8ef286c3e 100644 --- a/Scripts/Items/Armor/Studded/HideGloves.cs +++ b/Scripts/Items/Armor/Studded/HideGloves.cs @@ -6,26 +6,26 @@ namespace Server.Items [FlippableAttribute( 0x2B75, 0x316C )] public class HideGloves : BaseArmor { - public override Race RequiredRace { get { return Race.Elf; } } + public override Race RequiredRace => Race.Elf; - public override int BasePhysicalResistance{ get{ return 3; } } - public override int BaseFireResistance{ get{ return 3; } } - public override int BaseColdResistance{ get{ return 4; } } - public override int BasePoisonResistance{ get{ return 3; } } - public override int BaseEnergyResistance{ get{ return 2; } } + public override int BasePhysicalResistance => 3; + public override int BaseFireResistance => 3; + public override int BaseColdResistance => 4; + public override int BasePoisonResistance => 3; + public override int BaseEnergyResistance => 2; - public override int InitMinHits{ get{ return 35; } } - public override int InitMaxHits{ get{ return 45; } } + public override int InitMinHits => 35; + public override int InitMaxHits => 45; - public override int AosStrReq{ get{ return 15; } } - public override int OldStrReq{ get{ return 15; } } + public override int AosStrReq => 15; + public override int OldStrReq => 15; - public override int ArmorBase{ get{ return 15; } } + public override int ArmorBase => 15; - public override ArmorMaterialType MaterialType{ get{ return ArmorMaterialType.Studded; } } - public override CraftResource DefaultResource{ get{ return CraftResource.RegularLeather; } } + public override ArmorMaterialType MaterialType => ArmorMaterialType.Studded; + public override CraftResource DefaultResource => CraftResource.RegularLeather; - public override ArmorMeditationAllowance DefMedAllowance{ get{ return ArmorMeditationAllowance.Half; } } + public override ArmorMeditationAllowance DefMedAllowance => ArmorMeditationAllowance.Half; [Constructible] public HideGloves() : base( 0x2B75 ) @@ -43,7 +43,7 @@ namespace Server.Items writer.WriteEncodedInt( 0 ); } - + public override void Deserialize(GenericReader reader) { base.Deserialize( reader ); @@ -51,4 +51,4 @@ namespace Server.Items int version = reader.ReadEncodedInt(); } } -} \ No newline at end of file +} diff --git a/Scripts/Items/Armor/Studded/HideGorget.cs b/Scripts/Items/Armor/Studded/HideGorget.cs index 9289ec836..f0d2e4a05 100644 --- a/Scripts/Items/Armor/Studded/HideGorget.cs +++ b/Scripts/Items/Armor/Studded/HideGorget.cs @@ -6,26 +6,26 @@ namespace Server.Items [FlippableAttribute( 0x2B76, 0x316D )] public class HideGorget : BaseArmor { - public override Race RequiredRace { get { return Race.Elf; } } + public override Race RequiredRace => Race.Elf; - public override int BasePhysicalResistance{ get{ return 3; } } - public override int BaseFireResistance{ get{ return 3; } } - public override int BaseColdResistance{ get{ return 4; } } - public override int BasePoisonResistance{ get{ return 3; } } - public override int BaseEnergyResistance{ get{ return 2; } } + public override int BasePhysicalResistance => 3; + public override int BaseFireResistance => 3; + public override int BaseColdResistance => 4; + public override int BasePoisonResistance => 3; + public override int BaseEnergyResistance => 2; - public override int InitMinHits{ get{ return 35; } } - public override int InitMaxHits{ get{ return 45; } } + public override int InitMinHits => 35; + public override int InitMaxHits => 45; - public override int AosStrReq{ get{ return 15; } } - public override int OldStrReq{ get{ return 15; } } + public override int AosStrReq => 15; + public override int OldStrReq => 15; - public override int ArmorBase{ get{ return 15; } } + public override int ArmorBase => 15; - public override ArmorMaterialType MaterialType{ get{ return ArmorMaterialType.Studded; } } - public override CraftResource DefaultResource{ get{ return CraftResource.RegularLeather; } } + public override ArmorMaterialType MaterialType => ArmorMaterialType.Studded; + public override CraftResource DefaultResource => CraftResource.RegularLeather; - public override ArmorMeditationAllowance DefMedAllowance{ get{ return ArmorMeditationAllowance.Half; } } + public override ArmorMeditationAllowance DefMedAllowance => ArmorMeditationAllowance.Half; [Constructible] public HideGorget() : base( 0x2B76 ) @@ -36,13 +36,13 @@ namespace Server.Items public HideGorget( Serial serial ) : base( serial ) { } - + public override void Serialize( GenericWriter writer ) { base.Serialize( writer ); writer.Write( (int) 0 ); } - + public override void Deserialize(GenericReader reader) { base.Deserialize( reader ); @@ -52,4 +52,4 @@ namespace Server.Items Weight = 1.0; } } -} \ No newline at end of file +} diff --git a/Scripts/Items/Armor/Studded/HidePants.cs b/Scripts/Items/Armor/Studded/HidePants.cs index 5df11d6e5..aad17cfa4 100644 --- a/Scripts/Items/Armor/Studded/HidePants.cs +++ b/Scripts/Items/Armor/Studded/HidePants.cs @@ -6,26 +6,26 @@ namespace Server.Items [FlippableAttribute( 0x2B78, 0x316F )] public class HidePants : BaseArmor { - public override Race RequiredRace { get { return Race.Elf; } } + public override Race RequiredRace => Race.Elf; - public override int BasePhysicalResistance{ get{ return 3; } } - public override int BaseFireResistance{ get{ return 3; } } - public override int BaseColdResistance{ get{ return 4; } } - public override int BasePoisonResistance{ get{ return 3; } } - public override int BaseEnergyResistance{ get{ return 2; } } + public override int BasePhysicalResistance => 3; + public override int BaseFireResistance => 3; + public override int BaseColdResistance => 4; + public override int BasePoisonResistance => 3; + public override int BaseEnergyResistance => 2; - public override int InitMinHits{ get{ return 35; } } - public override int InitMaxHits{ get{ return 45; } } + public override int InitMinHits => 35; + public override int InitMaxHits => 45; - public override int AosStrReq{ get{ return 25; } } - public override int OldStrReq{ get{ return 25; } } + public override int AosStrReq => 25; + public override int OldStrReq => 25; - public override int ArmorBase{ get{ return 15; } } + public override int ArmorBase => 15; - public override ArmorMaterialType MaterialType{ get{ return ArmorMaterialType.Studded; } } - public override CraftResource DefaultResource{ get{ return CraftResource.RegularLeather; } } + public override ArmorMaterialType MaterialType => ArmorMaterialType.Studded; + public override CraftResource DefaultResource => CraftResource.RegularLeather; - public override ArmorMeditationAllowance DefMedAllowance{ get{ return ArmorMeditationAllowance.Half; } } + public override ArmorMeditationAllowance DefMedAllowance => ArmorMeditationAllowance.Half; [Constructible] public HidePants() : base( 0x2B78 ) @@ -43,7 +43,7 @@ namespace Server.Items writer.WriteEncodedInt( 0 ); } - + public override void Deserialize(GenericReader reader) { base.Deserialize( reader ); @@ -51,4 +51,4 @@ namespace Server.Items int version = reader.ReadEncodedInt(); } } -} \ No newline at end of file +} diff --git a/Scripts/Items/Armor/Studded/HidePauldrons.cs b/Scripts/Items/Armor/Studded/HidePauldrons.cs index be86dd396..5a43be9af 100644 --- a/Scripts/Items/Armor/Studded/HidePauldrons.cs +++ b/Scripts/Items/Armor/Studded/HidePauldrons.cs @@ -6,26 +6,26 @@ namespace Server.Items [FlippableAttribute( 0x2B77, 0x316E )] public class HidePauldrons : BaseArmor { - public override Race RequiredRace { get { return Race.Elf; } } + public override Race RequiredRace => Race.Elf; - public override int BasePhysicalResistance{ get{ return 3; } } - public override int BaseFireResistance{ get{ return 3; } } - public override int BaseColdResistance{ get{ return 4; } } - public override int BasePoisonResistance{ get{ return 3; } } - public override int BaseEnergyResistance{ get{ return 2; } } + public override int BasePhysicalResistance => 3; + public override int BaseFireResistance => 3; + public override int BaseColdResistance => 4; + public override int BasePoisonResistance => 3; + public override int BaseEnergyResistance => 2; - public override int InitMinHits{ get{ return 35; } } - public override int InitMaxHits{ get{ return 45; } } + public override int InitMinHits => 35; + public override int InitMaxHits => 45; - public override int AosStrReq{ get{ return 20; } } - public override int OldStrReq{ get{ return 20; } } + public override int AosStrReq => 20; + public override int OldStrReq => 20; - public override int ArmorBase{ get{ return 15; } } + public override int ArmorBase => 15; - public override ArmorMaterialType MaterialType{ get{ return ArmorMaterialType.Studded; } } - public override CraftResource DefaultResource{ get{ return CraftResource.RegularLeather; } } + public override ArmorMaterialType MaterialType => ArmorMaterialType.Studded; + public override CraftResource DefaultResource => CraftResource.RegularLeather; - public override ArmorMeditationAllowance DefMedAllowance{ get{ return ArmorMeditationAllowance.Half; } } + public override ArmorMeditationAllowance DefMedAllowance => ArmorMeditationAllowance.Half; [Constructible] public HidePauldrons() : base( 0x2B77 ) @@ -43,7 +43,7 @@ namespace Server.Items writer.WriteEncodedInt( 0 ); } - + public override void Deserialize(GenericReader reader) { base.Deserialize( reader ); @@ -51,4 +51,4 @@ namespace Server.Items int version = reader.ReadEncodedInt(); } } -} \ No newline at end of file +} diff --git a/Scripts/Items/Armor/Studded/StuddedArms.cs b/Scripts/Items/Armor/Studded/StuddedArms.cs index 0cda14f4b..d5cb13d3f 100644 --- a/Scripts/Items/Armor/Studded/StuddedArms.cs +++ b/Scripts/Items/Armor/Studded/StuddedArms.cs @@ -6,24 +6,24 @@ namespace Server.Items [FlippableAttribute( 0x13dc, 0x13d4 )] public class StuddedArms : BaseArmor { - public override int BasePhysicalResistance{ get{ return 2; } } - public override int BaseFireResistance{ get{ return 4; } } - public override int BaseColdResistance{ get{ return 3; } } - public override int BasePoisonResistance{ get{ return 3; } } - public override int BaseEnergyResistance{ get{ return 4; } } + public override int BasePhysicalResistance => 2; + public override int BaseFireResistance => 4; + public override int BaseColdResistance => 3; + public override int BasePoisonResistance => 3; + public override int BaseEnergyResistance => 4; - public override int InitMinHits{ get{ return 35; } } - public override int InitMaxHits{ get{ return 45; } } + public override int InitMinHits => 35; + public override int InitMaxHits => 45; - public override int AosStrReq{ get{ return 25; } } - public override int OldStrReq{ get{ return 25; } } + public override int AosStrReq => 25; + public override int OldStrReq => 25; - public override int ArmorBase{ get{ return 16; } } + public override int ArmorBase => 16; - public override ArmorMaterialType MaterialType{ get{ return ArmorMaterialType.Studded; } } - public override CraftResource DefaultResource{ get{ return CraftResource.RegularLeather; } } + public override ArmorMaterialType MaterialType => ArmorMaterialType.Studded; + public override CraftResource DefaultResource => CraftResource.RegularLeather; - public override ArmorMeditationAllowance DefMedAllowance{ get{ return ArmorMeditationAllowance.Half; } } + public override ArmorMeditationAllowance DefMedAllowance => ArmorMeditationAllowance.Half; [Constructible] public StuddedArms() : base( 0x13DC ) @@ -34,13 +34,13 @@ namespace Server.Items public StuddedArms( Serial serial ) : base( serial ) { } - + public override void Serialize( GenericWriter writer ) { base.Serialize( writer ); writer.Write( (int) 0 ); } - + public override void Deserialize(GenericReader reader) { base.Deserialize( reader ); @@ -50,4 +50,4 @@ namespace Server.Items Weight = 4.0; } } -} \ No newline at end of file +} diff --git a/Scripts/Items/Armor/Studded/StuddedBustierArms.cs b/Scripts/Items/Armor/Studded/StuddedBustierArms.cs index f2ad3930f..f4a679305 100644 --- a/Scripts/Items/Armor/Studded/StuddedBustierArms.cs +++ b/Scripts/Items/Armor/Studded/StuddedBustierArms.cs @@ -6,24 +6,24 @@ namespace Server.Items [FlippableAttribute( 0x1c0c, 0x1c0d )] public class StuddedBustierArms : BaseArmor { - public override int BasePhysicalResistance{ get{ return 2; } } - public override int BaseFireResistance{ get{ return 4; } } - public override int BaseColdResistance{ get{ return 3; } } - public override int BasePoisonResistance{ get{ return 3; } } - public override int BaseEnergyResistance{ get{ return 4; } } + public override int BasePhysicalResistance => 2; + public override int BaseFireResistance => 4; + public override int BaseColdResistance => 3; + public override int BasePoisonResistance => 3; + public override int BaseEnergyResistance => 4; - public override int InitMinHits{ get{ return 35; } } - public override int InitMaxHits{ get{ return 45; } } + public override int InitMinHits => 35; + public override int InitMaxHits => 45; - public override int AosStrReq{ get{ return 35; } } - public override int OldStrReq{ get{ return 35; } } + public override int AosStrReq => 35; + public override int OldStrReq => 35; - public override int ArmorBase{ get{ return 16; } } + public override int ArmorBase => 16; - public override ArmorMaterialType MaterialType{ get{ return ArmorMaterialType.Studded; } } - public override CraftResource DefaultResource{ get{ return CraftResource.RegularLeather; } } + public override ArmorMaterialType MaterialType => ArmorMaterialType.Studded; + public override CraftResource DefaultResource => CraftResource.RegularLeather; - public override ArmorMeditationAllowance DefMedAllowance{ get{ return ArmorMeditationAllowance.Half; } } + public override ArmorMeditationAllowance DefMedAllowance => ArmorMeditationAllowance.Half; public override bool AllowMaleWearer => false; diff --git a/Scripts/Items/Armor/Studded/StuddedChest.cs b/Scripts/Items/Armor/Studded/StuddedChest.cs index 018a647af..703e82364 100644 --- a/Scripts/Items/Armor/Studded/StuddedChest.cs +++ b/Scripts/Items/Armor/Studded/StuddedChest.cs @@ -6,24 +6,24 @@ namespace Server.Items [FlippableAttribute( 0x13db, 0x13e2 )] public class StuddedChest : BaseArmor { - public override int BasePhysicalResistance{ get{ return 2; } } - public override int BaseFireResistance{ get{ return 4; } } - public override int BaseColdResistance{ get{ return 3; } } - public override int BasePoisonResistance{ get{ return 3; } } - public override int BaseEnergyResistance{ get{ return 4; } } + public override int BasePhysicalResistance => 2; + public override int BaseFireResistance => 4; + public override int BaseColdResistance => 3; + public override int BasePoisonResistance => 3; + public override int BaseEnergyResistance => 4; - public override int InitMinHits{ get{ return 35; } } - public override int InitMaxHits{ get{ return 45; } } + public override int InitMinHits => 35; + public override int InitMaxHits => 45; - public override int AosStrReq{ get{ return 35; } } - public override int OldStrReq{ get{ return 35; } } + public override int AosStrReq => 35; + public override int OldStrReq => 35; - public override int ArmorBase{ get{ return 16; } } + public override int ArmorBase => 16; - public override ArmorMaterialType MaterialType{ get{ return ArmorMaterialType.Studded; } } - public override CraftResource DefaultResource{ get{ return CraftResource.RegularLeather; } } + public override ArmorMaterialType MaterialType => ArmorMaterialType.Studded; + public override CraftResource DefaultResource => CraftResource.RegularLeather; - public override ArmorMeditationAllowance DefMedAllowance{ get{ return ArmorMeditationAllowance.Half; } } + public override ArmorMeditationAllowance DefMedAllowance => ArmorMeditationAllowance.Half; [Constructible] public StuddedChest() : base( 0x13DB ) @@ -34,13 +34,13 @@ namespace Server.Items public StuddedChest( Serial serial ) : base( serial ) { } - + public override void Serialize( GenericWriter writer ) { base.Serialize( writer ); writer.Write( (int) 0 ); } - + public override void Deserialize(GenericReader reader) { base.Deserialize( reader ); @@ -50,4 +50,4 @@ namespace Server.Items Weight = 8.0; } } -} \ No newline at end of file +} diff --git a/Scripts/Items/Armor/Studded/StuddedDo.cs b/Scripts/Items/Armor/Studded/StuddedDo.cs index 403811e9b..704278d25 100644 --- a/Scripts/Items/Armor/Studded/StuddedDo.cs +++ b/Scripts/Items/Armor/Studded/StuddedDo.cs @@ -5,22 +5,22 @@ namespace Server.Items { public class StuddedDo : BaseArmor { - public override int BasePhysicalResistance{ get{ return 2; } } - public override int BaseFireResistance{ get{ return 4; } } - public override int BaseColdResistance{ get{ return 3; } } - public override int BasePoisonResistance{ get{ return 3; } } - public override int BaseEnergyResistance{ get{ return 4; } } + public override int BasePhysicalResistance => 2; + public override int BaseFireResistance => 4; + public override int BaseColdResistance => 3; + public override int BasePoisonResistance => 3; + public override int BaseEnergyResistance => 4; - public override int InitMinHits{ get{ return 40; } } - public override int InitMaxHits{ get{ return 50; } } + public override int InitMinHits => 40; + public override int InitMaxHits => 50; - public override int AosStrReq{ get{ return 55; } } - public override int OldStrReq{ get{ return 55; } } + public override int AosStrReq => 55; + public override int OldStrReq => 55; - public override int ArmorBase{ get{ return 3; } } + public override int ArmorBase => 3; - public override ArmorMaterialType MaterialType{ get{ return ArmorMaterialType.Studded; } } - public override CraftResource DefaultResource{ get{ return CraftResource.RegularLeather; } } + public override ArmorMaterialType MaterialType => ArmorMaterialType.Studded; + public override CraftResource DefaultResource => CraftResource.RegularLeather; [Constructible] public StuddedDo() : base( 0x27C7 ) @@ -31,17 +31,17 @@ namespace Server.Items public StuddedDo( Serial serial ) : base( serial ) { } - + public override void Serialize( GenericWriter writer ) { base.Serialize( writer ); writer.Write( (int) 0 ); } - + public override void Deserialize(GenericReader reader) { base.Deserialize( reader ); int version = reader.ReadInt(); } } -} \ No newline at end of file +} diff --git a/Scripts/Items/Armor/Studded/StuddedGloves.cs b/Scripts/Items/Armor/Studded/StuddedGloves.cs index 074680353..ce3d6080a 100644 --- a/Scripts/Items/Armor/Studded/StuddedGloves.cs +++ b/Scripts/Items/Armor/Studded/StuddedGloves.cs @@ -6,24 +6,24 @@ namespace Server.Items [FlippableAttribute( 0x13d5, 0x13dd )] public class StuddedGloves : BaseArmor { - public override int BasePhysicalResistance{ get{ return 2; } } - public override int BaseFireResistance{ get{ return 4; } } - public override int BaseColdResistance{ get{ return 3; } } - public override int BasePoisonResistance{ get{ return 3; } } - public override int BaseEnergyResistance{ get{ return 4; } } + public override int BasePhysicalResistance => 2; + public override int BaseFireResistance => 4; + public override int BaseColdResistance => 3; + public override int BasePoisonResistance => 3; + public override int BaseEnergyResistance => 4; - public override int InitMinHits{ get{ return 35; } } - public override int InitMaxHits{ get{ return 45; } } + public override int InitMinHits => 35; + public override int InitMaxHits => 45; - public override int AosStrReq{ get{ return 25; } } - public override int OldStrReq{ get{ return 25; } } + public override int AosStrReq => 25; + public override int OldStrReq => 25; - public override int ArmorBase{ get{ return 16; } } + public override int ArmorBase => 16; - public override ArmorMaterialType MaterialType{ get{ return ArmorMaterialType.Studded; } } - public override CraftResource DefaultResource{ get{ return CraftResource.RegularLeather; } } + public override ArmorMaterialType MaterialType => ArmorMaterialType.Studded; + public override CraftResource DefaultResource => CraftResource.RegularLeather; - public override ArmorMeditationAllowance DefMedAllowance{ get{ return ArmorMeditationAllowance.Half; } } + public override ArmorMeditationAllowance DefMedAllowance => ArmorMeditationAllowance.Half; [Constructible] public StuddedGloves() : base( 0x13D5 ) @@ -34,13 +34,13 @@ namespace Server.Items public StuddedGloves( Serial serial ) : base( serial ) { } - + public override void Serialize( GenericWriter writer ) { base.Serialize( writer ); writer.Write( (int) 0 ); } - + public override void Deserialize(GenericReader reader) { base.Deserialize( reader ); @@ -50,4 +50,4 @@ namespace Server.Items Weight = 1.0; } } -} \ No newline at end of file +} diff --git a/Scripts/Items/Armor/Studded/StuddedGorget.cs b/Scripts/Items/Armor/Studded/StuddedGorget.cs index 6c4357441..927eaa859 100644 --- a/Scripts/Items/Armor/Studded/StuddedGorget.cs +++ b/Scripts/Items/Armor/Studded/StuddedGorget.cs @@ -5,24 +5,24 @@ namespace Server.Items { public class StuddedGorget : BaseArmor { - public override int BasePhysicalResistance{ get{ return 2; } } - public override int BaseFireResistance{ get{ return 4; } } - public override int BaseColdResistance{ get{ return 3; } } - public override int BasePoisonResistance{ get{ return 3; } } - public override int BaseEnergyResistance{ get{ return 4; } } + public override int BasePhysicalResistance => 2; + public override int BaseFireResistance => 4; + public override int BaseColdResistance => 3; + public override int BasePoisonResistance => 3; + public override int BaseEnergyResistance => 4; - public override int InitMinHits{ get{ return 35; } } - public override int InitMaxHits{ get{ return 45; } } + public override int InitMinHits => 35; + public override int InitMaxHits => 45; - public override int AosStrReq{ get{ return 25; } } - public override int OldStrReq{ get{ return 25; } } + public override int AosStrReq => 25; + public override int OldStrReq => 25; - public override int ArmorBase{ get{ return 16; } } + public override int ArmorBase => 16; - public override ArmorMaterialType MaterialType{ get{ return ArmorMaterialType.Studded; } } - public override CraftResource DefaultResource{ get{ return CraftResource.RegularLeather; } } + public override ArmorMaterialType MaterialType => ArmorMaterialType.Studded; + public override CraftResource DefaultResource => CraftResource.RegularLeather; - public override ArmorMeditationAllowance DefMedAllowance{ get{ return ArmorMeditationAllowance.Half; } } + public override ArmorMeditationAllowance DefMedAllowance => ArmorMeditationAllowance.Half; [Constructible] public StuddedGorget() : base( 0x13D6 ) @@ -33,13 +33,13 @@ namespace Server.Items public StuddedGorget( Serial serial ) : base( serial ) { } - + public override void Serialize( GenericWriter writer ) { base.Serialize( writer ); writer.Write( (int) 0 ); } - + public override void Deserialize(GenericReader reader) { base.Deserialize( reader ); @@ -49,4 +49,4 @@ namespace Server.Items Weight = 1.0; } } -} \ No newline at end of file +} diff --git a/Scripts/Items/Armor/Studded/StuddedHaidate.cs b/Scripts/Items/Armor/Studded/StuddedHaidate.cs index ebb2dffe9..1791994a7 100644 --- a/Scripts/Items/Armor/Studded/StuddedHaidate.cs +++ b/Scripts/Items/Armor/Studded/StuddedHaidate.cs @@ -5,22 +5,22 @@ namespace Server.Items { public class StuddedHaidate : BaseArmor { - public override int BasePhysicalResistance{ get{ return 2; } } - public override int BaseFireResistance{ get{ return 4; } } - public override int BaseColdResistance{ get{ return 3; } } - public override int BasePoisonResistance{ get{ return 3; } } - public override int BaseEnergyResistance{ get{ return 4; } } + public override int BasePhysicalResistance => 2; + public override int BaseFireResistance => 4; + public override int BaseColdResistance => 3; + public override int BasePoisonResistance => 3; + public override int BaseEnergyResistance => 4; - public override int InitMinHits{ get{ return 35; } } - public override int InitMaxHits{ get{ return 45; } } + public override int InitMinHits => 35; + public override int InitMaxHits => 45; - public override int AosStrReq{ get{ return 30; } } - public override int OldStrReq{ get{ return 30; } } + public override int AosStrReq => 30; + public override int OldStrReq => 30; - public override int ArmorBase{ get{ return 3; } } + public override int ArmorBase => 3; - public override ArmorMaterialType MaterialType{ get{ return ArmorMaterialType.Studded; } } - public override CraftResource DefaultResource{ get{ return CraftResource.RegularLeather; } } + public override ArmorMaterialType MaterialType => ArmorMaterialType.Studded; + public override CraftResource DefaultResource => CraftResource.RegularLeather; [Constructible] public StuddedHaidate() : base( 0x278B ) @@ -31,17 +31,17 @@ namespace Server.Items public StuddedHaidate( Serial serial ) : base( serial ) { } - + public override void Serialize( GenericWriter writer ) { base.Serialize( writer ); writer.Write( (int) 0 ); } - + public override void Deserialize(GenericReader reader) { base.Deserialize( reader ); int version = reader.ReadInt(); } } -} \ No newline at end of file +} diff --git a/Scripts/Items/Armor/Studded/StuddedHiroSode.cs b/Scripts/Items/Armor/Studded/StuddedHiroSode.cs index e4f78a384..a04d593e9 100644 --- a/Scripts/Items/Armor/Studded/StuddedHiroSode.cs +++ b/Scripts/Items/Armor/Studded/StuddedHiroSode.cs @@ -5,22 +5,22 @@ namespace Server.Items { public class StuddedHiroSode : BaseArmor { - public override int BasePhysicalResistance{ get{ return 2; } } - public override int BaseFireResistance{ get{ return 4; } } - public override int BaseColdResistance{ get{ return 3; } } - public override int BasePoisonResistance{ get{ return 3; } } - public override int BaseEnergyResistance{ get{ return 4; } } + public override int BasePhysicalResistance => 2; + public override int BaseFireResistance => 4; + public override int BaseColdResistance => 3; + public override int BasePoisonResistance => 3; + public override int BaseEnergyResistance => 4; - public override int InitMinHits{ get{ return 45; } } - public override int InitMaxHits{ get{ return 55; } } + public override int InitMinHits => 45; + public override int InitMaxHits => 55; - public override int AosStrReq{ get{ return 30; } } - public override int OldStrReq{ get{ return 30; } } + public override int AosStrReq => 30; + public override int OldStrReq => 30; - public override int ArmorBase{ get{ return 3; } } + public override int ArmorBase => 3; - public override ArmorMaterialType MaterialType{ get{ return ArmorMaterialType.Studded; } } - public override CraftResource DefaultResource{ get{ return CraftResource.RegularLeather; } } + public override ArmorMaterialType MaterialType => ArmorMaterialType.Studded; + public override CraftResource DefaultResource => CraftResource.RegularLeather; [Constructible] public StuddedHiroSode() : base( 0x277F ) @@ -31,17 +31,17 @@ namespace Server.Items public StuddedHiroSode( Serial serial ) : base( serial ) { } - + public override void Serialize( GenericWriter writer ) { base.Serialize( writer ); writer.Write( (int) 0 ); } - + public override void Deserialize(GenericReader reader) { base.Deserialize( reader ); int version = reader.ReadInt(); } } -} \ No newline at end of file +} diff --git a/Scripts/Items/Armor/Studded/StuddedLegs.cs b/Scripts/Items/Armor/Studded/StuddedLegs.cs index 31a22cd82..63292bf1a 100644 --- a/Scripts/Items/Armor/Studded/StuddedLegs.cs +++ b/Scripts/Items/Armor/Studded/StuddedLegs.cs @@ -6,24 +6,24 @@ namespace Server.Items [FlippableAttribute( 0x13da, 0x13e1 )] public class StuddedLegs : BaseArmor { - public override int BasePhysicalResistance{ get{ return 2; } } - public override int BaseFireResistance{ get{ return 4; } } - public override int BaseColdResistance{ get{ return 3; } } - public override int BasePoisonResistance{ get{ return 3; } } - public override int BaseEnergyResistance{ get{ return 4; } } + public override int BasePhysicalResistance => 2; + public override int BaseFireResistance => 4; + public override int BaseColdResistance => 3; + public override int BasePoisonResistance => 3; + public override int BaseEnergyResistance => 4; - public override int InitMinHits{ get{ return 35; } } - public override int InitMaxHits{ get{ return 45; } } + public override int InitMinHits => 35; + public override int InitMaxHits => 45; - public override int AosStrReq{ get{ return 30; } } - public override int OldStrReq{ get{ return 35; } } + public override int AosStrReq => 30; + public override int OldStrReq => 35; - public override int ArmorBase{ get{ return 16; } } + public override int ArmorBase => 16; - public override ArmorMaterialType MaterialType{ get{ return ArmorMaterialType.Studded; } } - public override CraftResource DefaultResource{ get{ return CraftResource.RegularLeather; } } + public override ArmorMaterialType MaterialType => ArmorMaterialType.Studded; + public override CraftResource DefaultResource => CraftResource.RegularLeather; - public override ArmorMeditationAllowance DefMedAllowance{ get{ return ArmorMeditationAllowance.Half; } } + public override ArmorMeditationAllowance DefMedAllowance => ArmorMeditationAllowance.Half; [Constructible] public StuddedLegs() : base( 0x13DA ) @@ -34,13 +34,13 @@ namespace Server.Items public StuddedLegs( Serial serial ) : base( serial ) { } - + public override void Serialize( GenericWriter writer ) { base.Serialize( writer ); writer.Write( (int) 0 ); } - + public override void Deserialize(GenericReader reader) { base.Deserialize( reader ); @@ -50,4 +50,4 @@ namespace Server.Items Weight = 5.0; } } -} \ No newline at end of file +} diff --git a/Scripts/Items/Armor/Studded/StuddedMempo.cs b/Scripts/Items/Armor/Studded/StuddedMempo.cs index 34b5fa88f..f8395980e 100644 --- a/Scripts/Items/Armor/Studded/StuddedMempo.cs +++ b/Scripts/Items/Armor/Studded/StuddedMempo.cs @@ -5,22 +5,22 @@ namespace Server.Items { public class StuddedMempo : BaseArmor { - public override int BasePhysicalResistance{ get{ return 2; } } - public override int BaseFireResistance{ get{ return 4; } } - public override int BaseColdResistance{ get{ return 3; } } - public override int BasePoisonResistance{ get{ return 3; } } - public override int BaseEnergyResistance{ get{ return 3; } } + public override int BasePhysicalResistance => 2; + public override int BaseFireResistance => 4; + public override int BaseColdResistance => 3; + public override int BasePoisonResistance => 3; + public override int BaseEnergyResistance => 3; - public override int InitMinHits{ get{ return 30; } } - public override int InitMaxHits{ get{ return 40; } } + public override int InitMinHits => 30; + public override int InitMaxHits => 40; - public override int AosStrReq{ get{ return 30; } } - public override int OldStrReq{ get{ return 30; } } + public override int AosStrReq => 30; + public override int OldStrReq => 30; - public override int ArmorBase{ get{ return 3; } } + public override int ArmorBase => 3; - public override ArmorMaterialType MaterialType{ get{ return ArmorMaterialType.Studded; } } - public override CraftResource DefaultResource{ get{ return CraftResource.RegularLeather; } } + public override ArmorMaterialType MaterialType => ArmorMaterialType.Studded; + public override CraftResource DefaultResource => CraftResource.RegularLeather; [Constructible] public StuddedMempo() : base( 0x279D ) @@ -31,17 +31,17 @@ namespace Server.Items public StuddedMempo( Serial serial ) : base( serial ) { } - + public override void Serialize( GenericWriter writer ) { base.Serialize( writer ); writer.Write( (int) 0 ); } - + public override void Deserialize(GenericReader reader) { base.Deserialize( reader ); int version = reader.ReadInt(); } } -} \ No newline at end of file +} diff --git a/Scripts/Items/Armor/Studded/StuddedSuneate.cs b/Scripts/Items/Armor/Studded/StuddedSuneate.cs index 8d5c50180..d5b6fce7e 100644 --- a/Scripts/Items/Armor/Studded/StuddedSuneate.cs +++ b/Scripts/Items/Armor/Studded/StuddedSuneate.cs @@ -5,22 +5,22 @@ namespace Server.Items { public class StuddedSuneate : BaseArmor { - public override int BasePhysicalResistance{ get{ return 2; } } - public override int BaseFireResistance{ get{ return 4; } } - public override int BaseColdResistance{ get{ return 3; } } - public override int BasePoisonResistance{ get{ return 3; } } - public override int BaseEnergyResistance{ get{ return 4; } } + public override int BasePhysicalResistance => 2; + public override int BaseFireResistance => 4; + public override int BaseColdResistance => 3; + public override int BasePoisonResistance => 3; + public override int BaseEnergyResistance => 4; - public override int InitMinHits{ get{ return 35; } } - public override int InitMaxHits{ get{ return 50; } } + public override int InitMinHits => 35; + public override int InitMaxHits => 50; - public override int AosStrReq{ get{ return 30; } } - public override int OldStrReq{ get{ return 30; } } + public override int AosStrReq => 30; + public override int OldStrReq => 30; - public override int ArmorBase{ get{ return 3; } } + public override int ArmorBase => 3; - public override ArmorMaterialType MaterialType{ get{ return ArmorMaterialType.Studded; } } - public override CraftResource DefaultResource{ get{ return CraftResource.RegularLeather; } } + public override ArmorMaterialType MaterialType => ArmorMaterialType.Studded; + public override CraftResource DefaultResource => CraftResource.RegularLeather; [Constructible] public StuddedSuneate() : base( 0x27D2 ) @@ -31,17 +31,17 @@ namespace Server.Items public StuddedSuneate( Serial serial ) : base( serial ) { } - + public override void Serialize( GenericWriter writer ) { base.Serialize( writer ); writer.Write( (int) 0 ); } - + public override void Deserialize(GenericReader reader) { base.Deserialize( reader ); int version = reader.ReadInt(); } } -} \ No newline at end of file +} diff --git a/Scripts/Items/Books/Defined/BlackthornWelcomeBook.cs b/Scripts/Items/Books/Defined/BlackthornWelcomeBook.cs index 0c906d786..c239e63e6 100644 --- a/Scripts/Items/Books/Defined/BlackthornWelcomeBook.cs +++ b/Scripts/Items/Books/Defined/BlackthornWelcomeBook.cs @@ -268,7 +268,7 @@ namespace Server.Items ) ); - public override BookContent DefaultContent{ get{ return Content; } } + public override BookContent DefaultContent => Content; [Constructible] public BlackthornWelcomeBook() : base( false ) diff --git a/Scripts/Items/Books/Defined/DrakovsJournal.cs b/Scripts/Items/Books/Defined/DrakovsJournal.cs index 8fa392e29..3bcce8d7c 100644 --- a/Scripts/Items/Books/Defined/DrakovsJournal.cs +++ b/Scripts/Items/Books/Defined/DrakovsJournal.cs @@ -101,7 +101,7 @@ namespace Server.Items ) ); - public override BookContent DefaultContent{ get{ return Content; } } + public override BookContent DefaultContent => Content; [Constructible] public DrakovsJournal() : base( false ) @@ -126,4 +126,4 @@ namespace Server.Items int version = reader.ReadEncodedInt(); } } -} \ No newline at end of file +} diff --git a/Scripts/Items/Books/Defined/FropozJournal.cs b/Scripts/Items/Books/Defined/FropozJournal.cs index 737e46c33..931242c38 100644 --- a/Scripts/Items/Books/Defined/FropozJournal.cs +++ b/Scripts/Items/Books/Defined/FropozJournal.cs @@ -144,7 +144,7 @@ namespace Server.Items ) ); - public override BookContent DefaultContent{ get{ return Content; } } + public override BookContent DefaultContent => Content; [Constructible] public FropozJournal() : base( false ) @@ -179,4 +179,4 @@ namespace Server.Items int version = reader.ReadEncodedInt(); } } -} \ No newline at end of file +} diff --git a/Scripts/Items/Books/Defined/KaburJournal.cs b/Scripts/Items/Books/Defined/KaburJournal.cs index f3b1e3b09..3069961d9 100644 --- a/Scripts/Items/Books/Defined/KaburJournal.cs +++ b/Scripts/Items/Books/Defined/KaburJournal.cs @@ -229,7 +229,7 @@ namespace Server.Items ) ); - public override BookContent DefaultContent{ get{ return Content; } } + public override BookContent DefaultContent => Content; [Constructible] public KaburJournal() : base( false ) @@ -264,4 +264,4 @@ namespace Server.Items int version = reader.ReadEncodedInt(); } } -} \ No newline at end of file +} diff --git a/Scripts/Items/Books/Defined/LibraryBooks.cs b/Scripts/Items/Books/Defined/LibraryBooks.cs index d847b9537..60f6fee2b 100644 --- a/Scripts/Items/Books/Defined/LibraryBooks.cs +++ b/Scripts/Items/Books/Defined/LibraryBooks.cs @@ -264,7 +264,7 @@ namespace Server.Items ) ); - public override BookContent DefaultContent{ get{ return Content; } } + public override BookContent DefaultContent => Content; [Constructible] public GrammarOfOrcish() : base( Utility.Random( 0xFEF, 2 ), false ) @@ -459,7 +459,7 @@ namespace Server.Items ) ); - public override BookContent DefaultContent{ get{ return Content; } } + public override BookContent DefaultContent => Content; [Constructible] public CallToAnarchy() : base( Utility.Random( 0xFEF, 2 ), false ) @@ -665,7 +665,7 @@ namespace Server.Items ) ); - public override BookContent DefaultContent{ get{ return Content; } } + public override BookContent DefaultContent => Content; [Constructible] public ArmsAndWeaponsPrimer() : base( Utility.Random( 0xFEF, 2 ), false ) @@ -759,7 +759,7 @@ namespace Server.Items ) ); - public override BookContent DefaultContent{ get{ return Content; } } + public override BookContent DefaultContent => Content; [Constructible] public SongOfSamlethe() : base( Utility.Random( 0xFEF, 2 ), false ) @@ -900,7 +900,7 @@ namespace Server.Items ) ); - public override BookContent DefaultContent{ get{ return Content; } } + public override BookContent DefaultContent => Content; [Constructible] public TaleOfThreeTribes() : base( Utility.Random( 0xFEF, 2 ), false ) @@ -1125,7 +1125,7 @@ namespace Server.Items ) ); - public override BookContent DefaultContent{ get{ return Content; } } + public override BookContent DefaultContent => Content; [Constructible] public GuideToGuilds() : base( Utility.Random( 0xFEF, 2 ), false ) @@ -1462,7 +1462,7 @@ namespace Server.Items ) ); - public override BookContent DefaultContent{ get{ return Content; } } + public override BookContent DefaultContent => Content; [Constructible] public BirdsOfBritannia() : base( Utility.Random( 0xFEF, 2 ), false ) @@ -1694,7 +1694,7 @@ namespace Server.Items ) ); - public override BookContent DefaultContent{ get{ return Content; } } + public override BookContent DefaultContent => Content; [Constructible] public BritannianFlora() : base( Utility.Random( 0xFEF, 2 ), false ) @@ -1831,7 +1831,7 @@ namespace Server.Items ) ); - public override BookContent DefaultContent{ get{ return Content; } } + public override BookContent DefaultContent => Content; [Constructible] public ChildrenTalesVol2() : base( Utility.Random( 0xFEF, 2 ), false ) @@ -2092,7 +2092,7 @@ namespace Server.Items ) ); - public override BookContent DefaultContent{ get{ return Content; } } + public override BookContent DefaultContent => Content; [Constructible] public TalesOfVesperVol1() : base( Utility.Random( 0xFEF, 2 ), false ) @@ -2255,7 +2255,7 @@ namespace Server.Items ) ); - public override BookContent DefaultContent{ get{ return Content; } } + public override BookContent DefaultContent => Content; [Constructible] public DeceitDungeonOfHorror() : base( Utility.Random( 0xFEF, 2 ), false ) @@ -2488,7 +2488,7 @@ namespace Server.Items ) ); - public override BookContent DefaultContent{ get{ return Content; } } + public override BookContent DefaultContent => Content; [Constructible] public DimensionalTravel() : base( Utility.Random( 0xFEF, 2 ), false ) @@ -2793,7 +2793,7 @@ namespace Server.Items ) ); - public override BookContent DefaultContent{ get{ return Content; } } + public override BookContent DefaultContent => Content; [Constructible] public EthicalHedonism() : base( Utility.Random( 0xFEF, 2 ), false ) @@ -3363,7 +3363,7 @@ namespace Server.Items ) ); - public override BookContent DefaultContent{ get{ return Content; } } + public override BookContent DefaultContent => Content; [Constructible] public MyStory() : base( Utility.Random( 0xFEF, 2 ), false ) @@ -3560,7 +3560,7 @@ namespace Server.Items ) ); - public override BookContent DefaultContent{ get{ return Content; } } + public override BookContent DefaultContent => Content; [Constructible] public DiversityOfOurLand() : base( Utility.Random( 0xFEF, 2 ), false ) @@ -4010,7 +4010,7 @@ namespace Server.Items ) ); - public override BookContent DefaultContent{ get{ return Content; } } + public override BookContent DefaultContent => Content; [Constructible] public QuestOfVirtues() : base( Utility.Random( 0xFEF, 2 ), false ) @@ -4087,7 +4087,7 @@ namespace Server.Items ) ); - public override BookContent DefaultContent{ get{ return Content; } } + public override BookContent DefaultContent => Content; [Constructible] public RegardingLlamas() : base( Utility.Random( 0xFEF, 2 ), false ) @@ -4215,7 +4215,7 @@ namespace Server.Items ) ); - public override BookContent DefaultContent{ get{ return Content; } } + public override BookContent DefaultContent => Content; [Constructible] public TalkingToWisps() : base( Utility.Random( 0xFEF, 2 ), false ) @@ -4332,7 +4332,7 @@ namespace Server.Items ) ); - public override BookContent DefaultContent{ get{ return Content; } } + public override BookContent DefaultContent => Content; [Constructible] public TamingDragons() : base( Utility.Random( 0xFEF, 2 ), false ) @@ -4518,7 +4518,7 @@ namespace Server.Items ) ); - public override BookContent DefaultContent{ get{ return Content; } } + public override BookContent DefaultContent => Content; [Constructible] public BoldStranger() : base( Utility.Random( 0xFEF, 2 ), false ) @@ -4804,7 +4804,7 @@ namespace Server.Items ) ); - public override BookContent DefaultContent{ get{ return Content; } } + public override BookContent DefaultContent => Content; [Constructible] public BurningOfTrinsic() : base( Utility.Random( 0xFEF, 2 ), false ) @@ -4978,7 +4978,7 @@ namespace Server.Items ) ); - public override BookContent DefaultContent{ get{ return Content; } } + public override BookContent DefaultContent => Content; [Constructible] public TheFight() : base( Utility.Random( 0xFEF, 2 ), false ) @@ -5204,7 +5204,7 @@ namespace Server.Items ) ); - public override BookContent DefaultContent{ get{ return Content; } } + public override BookContent DefaultContent => Content; [Constructible] public LifeOfATravellingMinstrel() : base( Utility.Random( 0xFEF, 2 ), false ) @@ -5431,7 +5431,7 @@ namespace Server.Items ) ); - public override BookContent DefaultContent{ get{ return Content; } } + public override BookContent DefaultContent => Content; [Constructible] public MajorTradeAssociation() : base( Utility.Random( 0xFEF, 2 ), false ) @@ -5560,7 +5560,7 @@ namespace Server.Items ) ); - public override BookContent DefaultContent{ get{ return Content; } } + public override BookContent DefaultContent => Content; [Constructible] public RankingsOfTrades() : base( Utility.Random( 0xFEF, 2 ), false ) @@ -5769,7 +5769,7 @@ namespace Server.Items ) ); - public override BookContent DefaultContent{ get{ return Content; } } + public override BookContent DefaultContent => Content; [Constructible] public WildGirlOfTheForest() : base( Utility.Random( 0xFEF, 2 ), false ) @@ -5929,7 +5929,7 @@ namespace Server.Items ) ); - public override BookContent DefaultContent{ get{ return Content; } } + public override BookContent DefaultContent => Content; [Constructible] public TreatiseOnAlchemy() : base( Utility.Random( 0xFEF, 2 ), false ) @@ -6182,7 +6182,7 @@ namespace Server.Items ) ); - public override BookContent DefaultContent{ get{ return Content; } } + public override BookContent DefaultContent => Content; [Constructible] public VirtueBook() : base( Utility.Random( 0xFEF, 2 ), false ) @@ -6208,4 +6208,4 @@ namespace Server.Items } } #endregion -} \ No newline at end of file +} diff --git a/Scripts/Items/Books/Defined/NewAquariumBook.cs b/Scripts/Items/Books/Defined/NewAquariumBook.cs index 047926e10..ecfdf1f8b 100644 --- a/Scripts/Items/Books/Defined/NewAquariumBook.cs +++ b/Scripts/Items/Books/Defined/NewAquariumBook.cs @@ -103,7 +103,7 @@ namespace Server.Items ) ); - public override BookContent DefaultContent{ get{ return Content; } } + public override BookContent DefaultContent => Content; [Constructible] public NewAquariumBook() : base( false ) diff --git a/Scripts/Items/Books/Defined/TranslatedGargoyleJournal.cs b/Scripts/Items/Books/Defined/TranslatedGargoyleJournal.cs index 9aaeee5d5..d05c8bd69 100644 --- a/Scripts/Items/Books/Defined/TranslatedGargoyleJournal.cs +++ b/Scripts/Items/Books/Defined/TranslatedGargoyleJournal.cs @@ -126,7 +126,7 @@ namespace Server.Items ) ); - public override BookContent DefaultContent{ get{ return Content; } } + public override BookContent DefaultContent => Content; [Constructible] public TranslatedGargoyleJournal() : base( false ) @@ -161,4 +161,4 @@ namespace Server.Items int version = reader.ReadEncodedInt(); } } -} \ No newline at end of file +} diff --git a/Scripts/Items/Champion Artifacts/Decorative/EvilIdolSkull.cs b/Scripts/Items/Champion Artifacts/Decorative/EvilIdolSkull.cs index 69538d732..0cbf5e8f0 100644 --- a/Scripts/Items/Champion Artifacts/Decorative/EvilIdolSkull.cs +++ b/Scripts/Items/Champion Artifacts/Decorative/EvilIdolSkull.cs @@ -6,7 +6,7 @@ namespace Server.Items { public class EvilIdolSkull : Item { - public override int LabelNumber{ get{ return 1095237; } } // Evil Idol + public override int LabelNumber => 1095237; // Evil Idol [Constructible] public EvilIdolSkull() : base( 0x1F18 ) diff --git a/Scripts/Items/Champion Artifacts/Decorative/TatteredAncientMummyWrapping.cs b/Scripts/Items/Champion Artifacts/Decorative/TatteredAncientMummyWrapping.cs index b6191edf6..3b0558518 100644 --- a/Scripts/Items/Champion Artifacts/Decorative/TatteredAncientMummyWrapping.cs +++ b/Scripts/Items/Champion Artifacts/Decorative/TatteredAncientMummyWrapping.cs @@ -6,7 +6,7 @@ namespace Server.Items { public class TatteredAncientMummyWrapping : Item { - public override int LabelNumber{ get{ return 1094912; } } // Tattered Ancient Mummy Wrapping [Replica] + public override int LabelNumber => 1094912; // Tattered Ancient Mummy Wrapping [Replica] [Constructible] public TatteredAncientMummyWrapping() : base( 0xE21 ) diff --git a/Scripts/Items/Champion Artifacts/Decorative/WindSpirit.cs b/Scripts/Items/Champion Artifacts/Decorative/WindSpirit.cs index 31e317862..b933fce7e 100644 --- a/Scripts/Items/Champion Artifacts/Decorative/WindSpirit.cs +++ b/Scripts/Items/Champion Artifacts/Decorative/WindSpirit.cs @@ -6,7 +6,7 @@ namespace Server.Items { public class WindSpirit : Item { - public override int LabelNumber{ get{ return 1094925; } } // Wind Spirit [Replica] + public override int LabelNumber => 1094925; // Wind Spirit [Replica] [Constructible] public WindSpirit() : base( 0x1F1F ) diff --git a/Scripts/Items/Champion Artifacts/Shared/ANecromancerShroud.cs b/Scripts/Items/Champion Artifacts/Shared/ANecromancerShroud.cs index 271d17631..d4857723d 100644 --- a/Scripts/Items/Champion Artifacts/Shared/ANecromancerShroud.cs +++ b/Scripts/Items/Champion Artifacts/Shared/ANecromancerShroud.cs @@ -5,12 +5,12 @@ namespace Server.Items { public class ANecromancerShroud : Robe { - public override int LabelNumber{ get{ return 1094913; } } // A Necromancer Shroud [Replica] + public override int LabelNumber => 1094913; // A Necromancer Shroud [Replica] - public override int BaseColdResistance{ get{ return 5; } } + public override int BaseColdResistance => 5; - public override int InitMinHits{ get{ return 150; } } - public override int InitMaxHits{ get{ return 150; } } + public override int InitMinHits => 150; + public override int InitMaxHits => 150; public override bool CanFortify => false; diff --git a/Scripts/Items/Champion Artifacts/Shared/BraveKnightOfTheBritannia.cs b/Scripts/Items/Champion Artifacts/Shared/BraveKnightOfTheBritannia.cs index c692c32c9..c7071e702 100644 --- a/Scripts/Items/Champion Artifacts/Shared/BraveKnightOfTheBritannia.cs +++ b/Scripts/Items/Champion Artifacts/Shared/BraveKnightOfTheBritannia.cs @@ -5,10 +5,10 @@ namespace Server.Items { public class BraveKnightOfTheBritannia : Katana { - public override int LabelNumber{ get{ return 1094909; } } // Brave Knight of The Britannia [Replica] + public override int LabelNumber => 1094909; // Brave Knight of The Britannia [Replica] - public override int InitMinHits{ get{ return 150; } } - public override int InitMaxHits{ get{ return 150; } } + public override int InitMinHits => 150; + public override int InitMaxHits => 150; public override bool CanFortify => false; diff --git a/Scripts/Items/Champion Artifacts/Shared/CaptainJohnsHat.cs b/Scripts/Items/Champion Artifacts/Shared/CaptainJohnsHat.cs index 153b71505..f2d405122 100644 --- a/Scripts/Items/Champion Artifacts/Shared/CaptainJohnsHat.cs +++ b/Scripts/Items/Champion Artifacts/Shared/CaptainJohnsHat.cs @@ -5,16 +5,16 @@ namespace Server.Items { public class CaptainJohnsHat : TricorneHat { - public override int LabelNumber{ get{ return 1094911; } } // Captain John's Hat [Replica] + public override int LabelNumber => 1094911; // Captain John's Hat [Replica] - public override int BasePhysicalResistance{ get{ return 2; } } - public override int BaseFireResistance{ get{ return 6; } } - public override int BaseColdResistance{ get{ return 9; } } - public override int BasePoisonResistance{ get{ return 7; } } - public override int BaseEnergyResistance{ get{ return 23; } } + public override int BasePhysicalResistance => 2; + public override int BaseFireResistance => 6; + public override int BaseColdResistance => 9; + public override int BasePoisonResistance => 7; + public override int BaseEnergyResistance => 23; - public override int InitMinHits{ get{ return 150; } } - public override int InitMaxHits{ get{ return 150; } } + public override int InitMinHits => 150; + public override int InitMaxHits => 150; public override bool CanFortify => false; diff --git a/Scripts/Items/Champion Artifacts/Shared/DetectiveBoots.cs b/Scripts/Items/Champion Artifacts/Shared/DetectiveBoots.cs index b53cde6ba..35cf24417 100644 --- a/Scripts/Items/Champion Artifacts/Shared/DetectiveBoots.cs +++ b/Scripts/Items/Champion Artifacts/Shared/DetectiveBoots.cs @@ -5,10 +5,10 @@ namespace Server.Items { public class DetectiveBoots : Boots { - public override int LabelNumber{ get{ return 1094894 + m_Level; } } // [Quality] Detective of the Royal Guard [Replica] + public override int LabelNumber => 1094894 + m_Level; // [Quality] Detective of the Royal Guard [Replica] - public override int InitMinHits{ get{ return 150; } } - public override int InitMaxHits{ get{ return 150; } } + public override int InitMinHits => 150; + public override int InitMaxHits => 150; public override bool CanFortify => false; diff --git a/Scripts/Items/Champion Artifacts/Shared/DjinnisRing.cs b/Scripts/Items/Champion Artifacts/Shared/DjinnisRing.cs index 256c21967..3d7eedd89 100644 --- a/Scripts/Items/Champion Artifacts/Shared/DjinnisRing.cs +++ b/Scripts/Items/Champion Artifacts/Shared/DjinnisRing.cs @@ -5,10 +5,10 @@ namespace Server.Items { public class DjinnisRing : SilverRing { - public override int LabelNumber{ get{ return 1094927; } } // Djinni's Ring [Replica] + public override int LabelNumber => 1094927; // Djinni's Ring [Replica] - public override int InitMinHits{ get{ return 150; } } - public override int InitMaxHits{ get{ return 150; } } + public override int InitMinHits => 150; + public override int InitMaxHits => 150; [Constructible] public DjinnisRing() @@ -21,14 +21,14 @@ namespace Server.Items public DjinnisRing( Serial serial ) : base( serial ) { } - + public override void Serialize( GenericWriter writer ) { base.Serialize( writer ); writer.Write( (int) 0 ); } - + public override void Deserialize(GenericReader reader) { base.Deserialize( reader ); diff --git a/Scripts/Items/Champion Artifacts/Shared/EmbroideredOakLeafCloak.cs b/Scripts/Items/Champion Artifacts/Shared/EmbroideredOakLeafCloak.cs index 6eea5c318..f469907ac 100644 --- a/Scripts/Items/Champion Artifacts/Shared/EmbroideredOakLeafCloak.cs +++ b/Scripts/Items/Champion Artifacts/Shared/EmbroideredOakLeafCloak.cs @@ -5,10 +5,10 @@ namespace Server.Items { public class EmbroideredOakLeafCloak : BaseOuterTorso { - public override int LabelNumber{ get{ return 1094901; } } // Embroidered Oak Leaf Cloak [Replica] + public override int LabelNumber => 1094901; // Embroidered Oak Leaf Cloak [Replica] - public override int InitMinHits{ get{ return 150; } } - public override int InitMaxHits{ get{ return 150; } } + public override int InitMinHits => 150; + public override int InitMaxHits => 150; public override bool CanFortify => false; diff --git a/Scripts/Items/Champion Artifacts/Shared/GauntletsOfAnger.cs b/Scripts/Items/Champion Artifacts/Shared/GauntletsOfAnger.cs index 510ec8370..f849a58ad 100644 --- a/Scripts/Items/Champion Artifacts/Shared/GauntletsOfAnger.cs +++ b/Scripts/Items/Champion Artifacts/Shared/GauntletsOfAnger.cs @@ -5,16 +5,16 @@ namespace Server.Items { public class GuantletsOfAnger : PlateGloves { - public override int LabelNumber{ get{ return 1094902; } } // Gauntlets of Anger [Replica] + public override int LabelNumber => 1094902; // Gauntlets of Anger [Replica] - public override int BasePhysicalResistance{ get{ return 4; } } - public override int BaseFireResistance{ get{ return 4; } } - public override int BaseColdResistance{ get{ return 5; } } - public override int BasePoisonResistance{ get{ return 6; } } - public override int BaseEnergyResistance{ get{ return 5; } } + public override int BasePhysicalResistance => 4; + public override int BaseFireResistance => 4; + public override int BaseColdResistance => 5; + public override int BasePoisonResistance => 6; + public override int BaseEnergyResistance => 5; - public override int InitMinHits{ get{ return 150; } } - public override int InitMaxHits{ get{ return 150; } } + public override int InitMinHits => 150; + public override int InitMaxHits => 150; public override bool CanFortify => false; diff --git a/Scripts/Items/Champion Artifacts/Shared/LieutenantOfTheBritannianRoyalGuard.cs b/Scripts/Items/Champion Artifacts/Shared/LieutenantOfTheBritannianRoyalGuard.cs index dc0828b94..b87417ed2 100644 --- a/Scripts/Items/Champion Artifacts/Shared/LieutenantOfTheBritannianRoyalGuard.cs +++ b/Scripts/Items/Champion Artifacts/Shared/LieutenantOfTheBritannianRoyalGuard.cs @@ -5,10 +5,10 @@ namespace Server.Items { public class LieutenantOfTheBritannianRoyalGuard : BodySash { - public override int LabelNumber{ get{ return 1094910; } } // Lieutenant of the Britannian Royal Guard [Replica] + public override int LabelNumber => 1094910; // Lieutenant of the Britannian Royal Guard [Replica] - public override int InitMinHits{ get{ return 150; } } - public override int InitMaxHits{ get{ return 150; } } + public override int InitMinHits => 150; + public override int InitMaxHits => 150; public override bool CanFortify => false; diff --git a/Scripts/Items/Champion Artifacts/Shared/OblivionsNeedle.cs b/Scripts/Items/Champion Artifacts/Shared/OblivionsNeedle.cs index 016c9241c..d31290cb7 100644 --- a/Scripts/Items/Champion Artifacts/Shared/OblivionsNeedle.cs +++ b/Scripts/Items/Champion Artifacts/Shared/OblivionsNeedle.cs @@ -5,10 +5,10 @@ namespace Server.Items { public class OblivionsNeedle : Dagger { - public override int LabelNumber{ get{ return 1094916; } } // Oblivion's Needle [Replica] + public override int LabelNumber => 1094916; // Oblivion's Needle [Replica] - public override int InitMinHits{ get{ return 150; } } - public override int InitMaxHits{ get{ return 150; } } + public override int InitMinHits => 150; + public override int InitMaxHits => 150; public override bool CanFortify => false; diff --git a/Scripts/Items/Champion Artifacts/Shared/RoyalGuardSurvivalKnife.cs b/Scripts/Items/Champion Artifacts/Shared/RoyalGuardSurvivalKnife.cs index 7894725be..fee7c490b 100644 --- a/Scripts/Items/Champion Artifacts/Shared/RoyalGuardSurvivalKnife.cs +++ b/Scripts/Items/Champion Artifacts/Shared/RoyalGuardSurvivalKnife.cs @@ -5,10 +5,10 @@ namespace Server.Items { public class RoyalGuardSurvivalKnife : SkinningKnife { - public override int LabelNumber{ get{ return 1094918; } } // Royal Guard Survival Knife [Replica] + public override int LabelNumber => 1094918; // Royal Guard Survival Knife [Replica] - public override int InitMinHits{ get{ return 150; } } - public override int InitMaxHits{ get{ return 150; } } + public override int InitMinHits => 150; + public override int InitMaxHits => 150; public override bool CanFortify => false; diff --git a/Scripts/Items/Champion Artifacts/Shared/SamaritanRobe.cs b/Scripts/Items/Champion Artifacts/Shared/SamaritanRobe.cs index 6be83d8ae..f87e8ccab 100644 --- a/Scripts/Items/Champion Artifacts/Shared/SamaritanRobe.cs +++ b/Scripts/Items/Champion Artifacts/Shared/SamaritanRobe.cs @@ -5,12 +5,12 @@ namespace Server.Items { public class SamaritanRobe : Robe { - public override int LabelNumber{ get{ return 1094926; } } // Good Samaritan of Britannia [Replica] + public override int LabelNumber => 1094926; // Good Samaritan of Britannia [Replica] - public override int BasePhysicalResistance{ get{ return 5; } } + public override int BasePhysicalResistance => 5; - public override int InitMinHits{ get{ return 150; } } - public override int InitMaxHits{ get{ return 150; } } + public override int InitMinHits => 150; + public override int InitMaxHits => 150; public override bool CanFortify => false; diff --git a/Scripts/Items/Champion Artifacts/Shared/TheMostKnowledgePerson.cs b/Scripts/Items/Champion Artifacts/Shared/TheMostKnowledgePerson.cs index 959d8cc12..fbb178251 100644 --- a/Scripts/Items/Champion Artifacts/Shared/TheMostKnowledgePerson.cs +++ b/Scripts/Items/Champion Artifacts/Shared/TheMostKnowledgePerson.cs @@ -5,10 +5,10 @@ namespace Server.Items { public class TheMostKnowledgePerson : BaseOuterTorso { - public override int LabelNumber{ get{ return 1094893; } } // The Most Knowledge Person [Replica] + public override int LabelNumber => 1094893; // The Most Knowledge Person [Replica] - public override int InitMinHits{ get{ return 150; } } - public override int InitMaxHits{ get{ return 150; } } + public override int InitMinHits => 150; + public override int InitMaxHits => 150; public override bool CanFortify => false; diff --git a/Scripts/Items/Champion Artifacts/Shared/TheRobeOfBritanniaAri.cs b/Scripts/Items/Champion Artifacts/Shared/TheRobeOfBritanniaAri.cs index 0bcc40d38..293b4a9aa 100644 --- a/Scripts/Items/Champion Artifacts/Shared/TheRobeOfBritanniaAri.cs +++ b/Scripts/Items/Champion Artifacts/Shared/TheRobeOfBritanniaAri.cs @@ -5,12 +5,12 @@ namespace Server.Items { public class TheRobeOfBritanniaAri : BaseOuterTorso { - public override int LabelNumber{ get{ return 1094931; } } // The Robe of Britannia "Ari" [Replica] + public override int LabelNumber => 1094931; // The Robe of Britannia "Ari" [Replica] - public override int BasePhysicalResistance{ get{ return 10; } } + public override int BasePhysicalResistance => 10; - public override int InitMinHits{ get{ return 150; } } - public override int InitMaxHits{ get{ return 150; } } + public override int InitMinHits => 150; + public override int InitMaxHits => 150; public override bool CanFortify => false; diff --git a/Scripts/Items/Champion Artifacts/Unique/AcidProofRobe.cs b/Scripts/Items/Champion Artifacts/Unique/AcidProofRobe.cs index 3ded5d2da..5a4067e0a 100644 --- a/Scripts/Items/Champion Artifacts/Unique/AcidProofRobe.cs +++ b/Scripts/Items/Champion Artifacts/Unique/AcidProofRobe.cs @@ -5,12 +5,12 @@ namespace Server.Items { public class AcidProofRobe : Robe { - public override int LabelNumber{ get{ return 1095236; } } // Acid-Proof Robe [Replica] + public override int LabelNumber => 1095236; // Acid-Proof Robe [Replica] - public override int BaseFireResistance{ get{ return 4; } } + public override int BaseFireResistance => 4; - public override int InitMinHits{ get{ return 150; } } - public override int InitMaxHits{ get{ return 150; } } + public override int InitMinHits => 150; + public override int InitMaxHits => 150; public override bool CanFortify => false; diff --git a/Scripts/Items/Champion Artifacts/Unique/Calm.cs b/Scripts/Items/Champion Artifacts/Unique/Calm.cs index 4e66a57ac..c9955e86e 100644 --- a/Scripts/Items/Champion Artifacts/Unique/Calm.cs +++ b/Scripts/Items/Champion Artifacts/Unique/Calm.cs @@ -5,10 +5,10 @@ namespace Server.Items { public class Calm : Halberd { - public override int LabelNumber{ get{ return 1094915; } } // Calm [Replica] + public override int LabelNumber => 1094915; // Calm [Replica] - public override int InitMinHits{ get{ return 150; } } - public override int InitMaxHits{ get{ return 150; } } + public override int InitMinHits => 150; + public override int InitMaxHits => 150; public override bool CanFortify => false; diff --git a/Scripts/Items/Champion Artifacts/Unique/CrownOfTalKeesh.cs b/Scripts/Items/Champion Artifacts/Unique/CrownOfTalKeesh.cs index ad68d7926..e4aa2ae0e 100644 --- a/Scripts/Items/Champion Artifacts/Unique/CrownOfTalKeesh.cs +++ b/Scripts/Items/Champion Artifacts/Unique/CrownOfTalKeesh.cs @@ -5,16 +5,16 @@ namespace Server.Items { public class CrownOfTalKeesh : Bandana { - public override int LabelNumber{ get{ return 1094903; } } // Crown of Tal'Keesh [Replica] + public override int LabelNumber => 1094903; // Crown of Tal'Keesh [Replica] - public override int BasePhysicalResistance{ get{ return 0; } } - public override int BaseFireResistance{ get{ return 5; } } - public override int BaseColdResistance{ get{ return 9; } } - public override int BasePoisonResistance{ get{ return 20; } } - public override int BaseEnergyResistance{ get{ return 20; } } + public override int BasePhysicalResistance => 0; + public override int BaseFireResistance => 5; + public override int BaseColdResistance => 9; + public override int BasePoisonResistance => 20; + public override int BaseEnergyResistance => 20; - public override int InitMinHits{ get{ return 150; } } - public override int InitMaxHits{ get{ return 150; } } + public override int InitMinHits => 150; + public override int InitMaxHits => 150; public override bool CanFortify => false; diff --git a/Scripts/Items/Champion Artifacts/Unique/FangOfRactus.cs b/Scripts/Items/Champion Artifacts/Unique/FangOfRactus.cs index 280449067..7652082b7 100644 --- a/Scripts/Items/Champion Artifacts/Unique/FangOfRactus.cs +++ b/Scripts/Items/Champion Artifacts/Unique/FangOfRactus.cs @@ -5,10 +5,10 @@ namespace Server.Items { public class FangOfRactus : Kryss { - public override int LabelNumber{ get{ return 1094892; } } // Fang of Ractus [Replica] + public override int LabelNumber => 1094892; // Fang of Ractus [Replica] - public override int InitMinHits{ get{ return 150; } } - public override int InitMaxHits{ get{ return 150; } } + public override int InitMinHits => 150; + public override int InitMaxHits => 150; public override bool CanFortify => false; diff --git a/Scripts/Items/Champion Artifacts/Unique/GladiatorsCollar.cs b/Scripts/Items/Champion Artifacts/Unique/GladiatorsCollar.cs index 9b3e6a957..ebc5d6e70 100644 --- a/Scripts/Items/Champion Artifacts/Unique/GladiatorsCollar.cs +++ b/Scripts/Items/Champion Artifacts/Unique/GladiatorsCollar.cs @@ -5,16 +5,16 @@ namespace Server.Items { public class GladiatorsCollar : PlateGorget { - public override int LabelNumber{ get{ return 1094917; } } // Gladiator's Collar [Replica] + public override int LabelNumber => 1094917; // Gladiator's Collar [Replica] - public override int BasePhysicalResistance{ get{ return 18; } } - public override int BaseFireResistance{ get{ return 18; } } - public override int BaseColdResistance{ get{ return 17; } } - public override int BasePoisonResistance{ get{ return 18; } } - public override int BaseEnergyResistance{ get{ return 16; } } + public override int BasePhysicalResistance => 18; + public override int BaseFireResistance => 18; + public override int BaseColdResistance => 17; + public override int BasePoisonResistance => 18; + public override int BaseEnergyResistance => 16; - public override int InitMinHits{ get{ return 150; } } - public override int InitMaxHits{ get{ return 150; } } + public override int InitMinHits => 150; + public override int InitMaxHits => 150; public override bool CanFortify => false; diff --git a/Scripts/Items/Champion Artifacts/Unique/OrcChieftainHelm.cs b/Scripts/Items/Champion Artifacts/Unique/OrcChieftainHelm.cs index 8a0e84805..008dcd211 100644 --- a/Scripts/Items/Champion Artifacts/Unique/OrcChieftainHelm.cs +++ b/Scripts/Items/Champion Artifacts/Unique/OrcChieftainHelm.cs @@ -5,16 +5,16 @@ namespace Server.Items { public class OrcChieftainHelm : OrcHelm { - public override int LabelNumber{ get{ return 1094924; } } // Orc Chieftain Helm [Replica] + public override int LabelNumber => 1094924; // Orc Chieftain Helm [Replica] - public override int BasePhysicalResistance{ get{ return 23; } } - public override int BaseFireResistance{ get{ return 1; } } - public override int BaseColdResistance{ get{ return 23; } } - public override int BasePoisonResistance{ get{ return 3; } } - public override int BaseEnergyResistance{ get{ return 5; } } + public override int BasePhysicalResistance => 23; + public override int BaseFireResistance => 1; + public override int BaseColdResistance => 23; + public override int BasePoisonResistance => 3; + public override int BaseEnergyResistance => 5; - public override int InitMinHits{ get{ return 150; } } - public override int InitMaxHits{ get{ return 150; } } + public override int InitMinHits => 150; + public override int InitMaxHits => 150; public override bool CanFortify => false; diff --git a/Scripts/Items/Champion Artifacts/Unique/Pacify.cs b/Scripts/Items/Champion Artifacts/Unique/Pacify.cs index 1d36e96e5..c95854880 100644 --- a/Scripts/Items/Champion Artifacts/Unique/Pacify.cs +++ b/Scripts/Items/Champion Artifacts/Unique/Pacify.cs @@ -5,10 +5,10 @@ namespace Server.Items { public class Pacify : Pike { - public override int LabelNumber{ get{ return 1094929; } } // Pacify [Replica] + public override int LabelNumber => 1094929; // Pacify [Replica] - public override int InitMinHits{ get{ return 150; } } - public override int InitMaxHits{ get{ return 150; } } + public override int InitMinHits => 150; + public override int InitMaxHits => 150; public override bool CanFortify => false; diff --git a/Scripts/Items/Champion Artifacts/Unique/Quell.cs b/Scripts/Items/Champion Artifacts/Unique/Quell.cs index 3ecb94118..5fa75004f 100644 --- a/Scripts/Items/Champion Artifacts/Unique/Quell.cs +++ b/Scripts/Items/Champion Artifacts/Unique/Quell.cs @@ -5,10 +5,10 @@ namespace Server.Items { public class Quell : Bardiche { - public override int LabelNumber{ get{ return 1094928; } } // Quell [Replica] + public override int LabelNumber => 1094928; // Quell [Replica] - public override int InitMinHits{ get{ return 150; } } - public override int InitMaxHits{ get{ return 150; } } + public override int InitMinHits => 150; + public override int InitMaxHits => 150; public override bool CanFortify => false; diff --git a/Scripts/Items/Champion Artifacts/Unique/ShroudOfDeceit.cs b/Scripts/Items/Champion Artifacts/Unique/ShroudOfDeceit.cs index 6d8e24a31..060ea4bc9 100644 --- a/Scripts/Items/Champion Artifacts/Unique/ShroudOfDeceit.cs +++ b/Scripts/Items/Champion Artifacts/Unique/ShroudOfDeceit.cs @@ -5,16 +5,16 @@ namespace Server.Items { public class ShroudOfDeciet : BoneChest { - public override int LabelNumber{ get{ return 1094914; } } // Shroud of Deceit [Replica] + public override int LabelNumber => 1094914; // Shroud of Deceit [Replica] - public override int BasePhysicalResistance{ get{ return 11; } } - public override int BaseFireResistance{ get{ return 6; } } - public override int BaseColdResistance{ get{ return 18; } } - public override int BasePoisonResistance{ get{ return 15; } } - public override int BaseEnergyResistance{ get{ return 13; } } + public override int BasePhysicalResistance => 11; + public override int BaseFireResistance => 6; + public override int BaseColdResistance => 18; + public override int BasePoisonResistance => 15; + public override int BaseEnergyResistance => 13; - public override int InitMinHits{ get{ return 150; } } - public override int InitMaxHits{ get{ return 150; } } + public override int InitMinHits => 150; + public override int InitMaxHits => 150; public override bool CanFortify => false; diff --git a/Scripts/Items/Champion Artifacts/Unique/Subdue.cs b/Scripts/Items/Champion Artifacts/Unique/Subdue.cs index 216effeae..4bca79271 100644 --- a/Scripts/Items/Champion Artifacts/Unique/Subdue.cs +++ b/Scripts/Items/Champion Artifacts/Unique/Subdue.cs @@ -5,10 +5,10 @@ namespace Server.Items { public class Subdue : Scythe { - public override int LabelNumber{ get{ return 1094930; } } // Subdue [Replica] + public override int LabelNumber => 1094930; // Subdue [Replica] - public override int InitMinHits{ get{ return 150; } } - public override int InitMaxHits{ get{ return 150; } } + public override int InitMinHits => 150; + public override int InitMaxHits => 150; public override bool CanFortify => false; diff --git a/Scripts/Items/Clothing/Artifacts/CrimsonCincture.cs b/Scripts/Items/Clothing/Artifacts/CrimsonCincture.cs index bb5e0ae08..608ef4c64 100644 --- a/Scripts/Items/Clothing/Artifacts/CrimsonCincture.cs +++ b/Scripts/Items/Clothing/Artifacts/CrimsonCincture.cs @@ -4,13 +4,13 @@ namespace Server.Items { public class CrimsonCincture : HalfApron, ITokunoDyable { - public override int LabelNumber{ get{ return 1075043; } } // Crimson Cincture - + public override int LabelNumber => 1075043; // Crimson Cincture + [Constructible] - public CrimsonCincture() : base() + public CrimsonCincture() { Hue = 0x485; - + Attributes.BonusDex = 5; Attributes.BonusHits = 10; Attributes.RegenHits = 2; @@ -23,14 +23,14 @@ namespace Server.Items public override void Serialize( GenericWriter writer ) { base.Serialize( writer ); - + writer.Write( (int) 0 ); // version } public override void Deserialize( GenericReader reader ) { base.Deserialize( reader ); - + int version = reader.ReadInt(); } } diff --git a/Scripts/Items/Clothing/Artifacts/DivineCountenance.cs b/Scripts/Items/Clothing/Artifacts/DivineCountenance.cs index adc91477c..6bb34c53f 100644 --- a/Scripts/Items/Clothing/Artifacts/DivineCountenance.cs +++ b/Scripts/Items/Clothing/Artifacts/DivineCountenance.cs @@ -5,17 +5,17 @@ namespace Server.Items { public class DivineCountenance : HornedTribalMask { - public override int LabelNumber{ get{ return 1061289; } } // Divine Countenance + public override int LabelNumber => 1061289; // Divine Countenance - public override int ArtifactRarity{ get{ return 11; } } + public override int ArtifactRarity => 11; - public override int BasePhysicalResistance{ get{ return 8; } } - public override int BaseFireResistance{ get{ return 6; } } - public override int BaseColdResistance{ get{ return 9; } } - public override int BaseEnergyResistance{ get{ return 25; } } + public override int BasePhysicalResistance => 8; + public override int BaseFireResistance => 6; + public override int BaseColdResistance => 9; + public override int BaseEnergyResistance => 25; - public override int InitMinHits{ get{ return 255; } } - public override int InitMaxHits{ get{ return 255; } } + public override int InitMinHits => 255; + public override int InitMaxHits => 255; [Constructible] public DivineCountenance() @@ -31,14 +31,14 @@ namespace Server.Items public DivineCountenance( Serial serial ) : base( serial ) { } - + public override void Serialize( GenericWriter writer ) { base.Serialize( writer ); writer.Write( (int) 1 ); } - + public override void Deserialize(GenericReader reader) { base.Deserialize( reader ); @@ -58,4 +58,4 @@ namespace Server.Items } } } -} \ No newline at end of file +} diff --git a/Scripts/Items/Clothing/Artifacts/HatOfTheMagi.cs b/Scripts/Items/Clothing/Artifacts/HatOfTheMagi.cs index 50602d06a..613acce13 100644 --- a/Scripts/Items/Clothing/Artifacts/HatOfTheMagi.cs +++ b/Scripts/Items/Clothing/Artifacts/HatOfTheMagi.cs @@ -5,15 +5,15 @@ namespace Server.Items { public class HatOfTheMagi : WizardsHat { - public override int LabelNumber{ get{ return 1061597; } } // Hat of the Magi + public override int LabelNumber => 1061597; // Hat of the Magi - public override int ArtifactRarity{ get{ return 11; } } + public override int ArtifactRarity => 11; - public override int BasePoisonResistance{ get{ return 20; } } - public override int BaseEnergyResistance{ get{ return 20; } } + public override int BasePoisonResistance => 20; + public override int BaseEnergyResistance => 20; - public override int InitMinHits{ get{ return 255; } } - public override int InitMaxHits{ get{ return 255; } } + public override int InitMinHits => 255; + public override int InitMaxHits => 255; [Constructible] public HatOfTheMagi() @@ -28,14 +28,14 @@ namespace Server.Items public HatOfTheMagi( Serial serial ) : base( serial ) { } - + public override void Serialize( GenericWriter writer ) { base.Serialize( writer ); writer.Write( (int) 1 ); } - + public override void Deserialize(GenericReader reader) { base.Deserialize( reader ); @@ -53,4 +53,4 @@ namespace Server.Items } } } -} \ No newline at end of file +} diff --git a/Scripts/Items/Clothing/Artifacts/HuntersHeaddress.cs b/Scripts/Items/Clothing/Artifacts/HuntersHeaddress.cs index 5df14b236..ac2aa2736 100644 --- a/Scripts/Items/Clothing/Artifacts/HuntersHeaddress.cs +++ b/Scripts/Items/Clothing/Artifacts/HuntersHeaddress.cs @@ -5,14 +5,14 @@ namespace Server.Items { public class HuntersHeaddress : DeerMask { - public override int LabelNumber{ get{ return 1061595; } } // Hunter's Headdress + public override int LabelNumber => 1061595; // Hunter's Headdress - public override int ArtifactRarity{ get{ return 11; } } + public override int ArtifactRarity => 11; - public override int BaseColdResistance{ get{ return 23; } } + public override int BaseColdResistance => 23; - public override int InitMinHits{ get{ return 255; } } - public override int InitMaxHits{ get{ return 255; } } + public override int InitMinHits => 255; + public override int InitMaxHits => 255; [Constructible] public HuntersHeaddress() @@ -30,14 +30,14 @@ namespace Server.Items public HuntersHeaddress( Serial serial ) : base( serial ) { } - + public override void Serialize( GenericWriter writer ) { base.Serialize( writer ); writer.Write( (int) 1 ); } - + public override void Deserialize(GenericReader reader) { base.Deserialize( reader ); @@ -53,4 +53,4 @@ namespace Server.Items } } } -} \ No newline at end of file +} diff --git a/Scripts/Items/Clothing/Artifacts/SpiritOfTheTotem.cs b/Scripts/Items/Clothing/Artifacts/SpiritOfTheTotem.cs index d0449b96c..89d8cb029 100644 --- a/Scripts/Items/Clothing/Artifacts/SpiritOfTheTotem.cs +++ b/Scripts/Items/Clothing/Artifacts/SpiritOfTheTotem.cs @@ -5,14 +5,14 @@ namespace Server.Items { public class SpiritOfTheTotem : BearMask { - public override int LabelNumber{ get{ return 1061599; } } // Spirit of the Totem + public override int LabelNumber => 1061599; // Spirit of the Totem - public override int ArtifactRarity{ get{ return 11; } } + public override int ArtifactRarity => 11; - public override int BasePhysicalResistance{ get{ return 20; } } + public override int BasePhysicalResistance => 20; - public override int InitMinHits{ get{ return 255; } } - public override int InitMaxHits{ get{ return 255; } } + public override int InitMinHits => 255; + public override int InitMaxHits => 255; [Constructible] public SpiritOfTheTotem() @@ -27,14 +27,14 @@ namespace Server.Items public SpiritOfTheTotem( Serial serial ) : base( serial ) { } - + public override void Serialize( GenericWriter writer ) { base.Serialize( writer ); writer.Write( (int) 1 ); } - + public override void Deserialize(GenericReader reader) { base.Deserialize( reader ); @@ -51,4 +51,4 @@ namespace Server.Items } } } -} \ No newline at end of file +} diff --git a/Scripts/Items/Clothing/BaseClothing.cs b/Scripts/Items/Clothing/BaseClothing.cs index 6f8a926b2..be32e0c44 100644 --- a/Scripts/Items/Clothing/BaseClothing.cs +++ b/Scripts/Items/Clothing/BaseClothing.cs @@ -66,11 +66,11 @@ namespace Server.Items [CommandProperty( AccessLevel.GameMaster )] public int HitPoints { - get + get { return m_HitPoints; } - set + set { if ( value != m_HitPoints && MaxHitPoints > 0 ) { @@ -157,11 +157,11 @@ namespace Server.Items public virtual int BasePoisonResistance{ get{ return 0; } } public virtual int BaseEnergyResistance{ get{ return 0; } } - public override int PhysicalResistance{ get{ return BasePhysicalResistance + m_AosResistances.Physical; } } - public override int FireResistance{ get{ return BaseFireResistance + m_AosResistances.Fire; } } - public override int ColdResistance{ get{ return BaseColdResistance + m_AosResistances.Cold; } } - public override int PoisonResistance{ get{ return BasePoisonResistance + m_AosResistances.Poison; } } - public override int EnergyResistance{ get{ return BaseEnergyResistance + m_AosResistances.Energy; } } + public override int PhysicalResistance => BasePhysicalResistance + m_AosResistances.Physical; + public override int FireResistance => BaseFireResistance + m_AosResistances.Fire; + public override int ColdResistance => BaseColdResistance + m_AosResistances.Cold; + public override int PoisonResistance => BasePoisonResistance + m_AosResistances.Poison; + public override int EnergyResistance => BaseEnergyResistance + m_AosResistances.Energy; public virtual int ArtifactRarity{ get{ return 0; } } @@ -177,7 +177,7 @@ namespace Server.Items return base.AllowSecureTrade( from, to, newOwner, accepted ); } - public virtual Race RequiredRace { get { return null; } } + public virtual Race RequiredRace => null; public override bool CanEquip( Mobile from ) { @@ -378,7 +378,7 @@ namespace Server.Items damageTaken -= Absorbed; - if ( damageTaken < 0 ) + if ( damageTaken < 0 ) damageTaken = 0; if ( 25 > Utility.Random( 100 ) ) // 25% chance to lower durability @@ -1037,4 +1037,4 @@ namespace Server.Items #endregion } -} \ No newline at end of file +} diff --git a/Scripts/Items/Clothing/Cloaks.cs b/Scripts/Items/Clothing/Cloaks.cs index 2d4b100e7..95b67cd1c 100644 --- a/Scripts/Items/Clothing/Cloaks.cs +++ b/Scripts/Items/Clothing/Cloaks.cs @@ -186,7 +186,7 @@ namespace Server.Items } } - public override int BasePhysicalResistance{ get{ return 3; } } + public override int BasePhysicalResistance => 3; public override void OnAdded(IEntity parent) { @@ -312,4 +312,4 @@ namespace Server.Items int version = reader.ReadInt(); } } -} \ No newline at end of file +} diff --git a/Scripts/Items/Clothing/Hats.cs b/Scripts/Items/Clothing/Hats.cs index 4f48f9631..af54fb64a 100644 --- a/Scripts/Items/Clothing/Hats.cs +++ b/Scripts/Items/Clothing/Hats.cs @@ -83,14 +83,14 @@ namespace Server.Items [Flippable( 0x2798, 0x27E3 )] public class Kasa : BaseHat { - public override int BasePhysicalResistance{ get{ return 0; } } - public override int BaseFireResistance{ get{ return 5; } } - public override int BaseColdResistance{ get{ return 9; } } - public override int BasePoisonResistance{ get{ return 5; } } - public override int BaseEnergyResistance{ get{ return 5; } } + public override int BasePhysicalResistance => 0; + public override int BaseFireResistance => 5; + public override int BaseColdResistance => 9; + public override int BasePoisonResistance => 5; + public override int BaseEnergyResistance => 5; - public override int InitMinHits{ get{ return 20; } } - public override int InitMaxHits{ get{ return 30; } } + public override int InitMinHits => 20; + public override int InitMaxHits => 30; [Constructible] public Kasa() : this( 0 ) @@ -125,14 +125,14 @@ namespace Server.Items [Flippable( 0x278F, 0x27DA )] public class ClothNinjaHood : BaseHat { - public override int BasePhysicalResistance{ get{ return 3; } } - public override int BaseFireResistance{ get{ return 3; } } - public override int BaseColdResistance{ get{ return 6; } } - public override int BasePoisonResistance{ get{ return 9; } } - public override int BaseEnergyResistance{ get{ return 9; } } + public override int BasePhysicalResistance => 3; + public override int BaseFireResistance => 3; + public override int BaseColdResistance => 6; + public override int BasePoisonResistance => 9; + public override int BaseEnergyResistance => 9; - public override int InitMinHits{ get{ return 20; } } - public override int InitMaxHits{ get{ return 30; } } + public override int InitMinHits => 20; + public override int InitMaxHits => 30; [Constructible] public ClothNinjaHood() : this( 0 ) @@ -167,14 +167,14 @@ namespace Server.Items [Flippable( 0x2306, 0x2305 )] public class FlowerGarland : BaseHat { - public override int BasePhysicalResistance{ get{ return 3; } } - public override int BaseFireResistance{ get{ return 3; } } - public override int BaseColdResistance{ get{ return 6; } } - public override int BasePoisonResistance{ get{ return 9; } } - public override int BaseEnergyResistance{ get{ return 9; } } + public override int BasePhysicalResistance => 3; + public override int BaseFireResistance => 3; + public override int BaseColdResistance => 6; + public override int BasePoisonResistance => 9; + public override int BaseEnergyResistance => 9; - public override int InitMinHits{ get{ return 20; } } - public override int InitMaxHits{ get{ return 30; } } + public override int InitMinHits => 20; + public override int InitMaxHits => 30; [Constructible] public FlowerGarland() : this( 0 ) @@ -208,14 +208,14 @@ namespace Server.Items public class FloppyHat : BaseHat { - public override int BasePhysicalResistance{ get{ return 0; } } - public override int BaseFireResistance{ get{ return 5; } } - public override int BaseColdResistance{ get{ return 9; } } - public override int BasePoisonResistance{ get{ return 5; } } - public override int BaseEnergyResistance{ get{ return 5; } } + public override int BasePhysicalResistance => 0; + public override int BaseFireResistance => 5; + public override int BaseColdResistance => 9; + public override int BasePoisonResistance => 5; + public override int BaseEnergyResistance => 5; - public override int InitMinHits{ get{ return 20; } } - public override int InitMaxHits{ get{ return 30; } } + public override int InitMinHits => 20; + public override int InitMaxHits => 30; [Constructible] public FloppyHat() : this( 0 ) @@ -249,14 +249,14 @@ namespace Server.Items public class WideBrimHat : BaseHat { - public override int BasePhysicalResistance{ get{ return 0; } } - public override int BaseFireResistance{ get{ return 5; } } - public override int BaseColdResistance{ get{ return 9; } } - public override int BasePoisonResistance{ get{ return 5; } } - public override int BaseEnergyResistance{ get{ return 5; } } + public override int BasePhysicalResistance => 0; + public override int BaseFireResistance => 5; + public override int BaseColdResistance => 9; + public override int BasePoisonResistance => 5; + public override int BaseEnergyResistance => 5; - public override int InitMinHits{ get{ return 20; } } - public override int InitMaxHits{ get{ return 30; } } + public override int InitMinHits => 20; + public override int InitMaxHits => 30; [Constructible] public WideBrimHat() : this( 0 ) @@ -290,14 +290,14 @@ namespace Server.Items public class Cap : BaseHat { - public override int BasePhysicalResistance{ get{ return 0; } } - public override int BaseFireResistance{ get{ return 5; } } - public override int BaseColdResistance{ get{ return 9; } } - public override int BasePoisonResistance{ get{ return 5; } } - public override int BaseEnergyResistance{ get{ return 5; } } + public override int BasePhysicalResistance => 0; + public override int BaseFireResistance => 5; + public override int BaseColdResistance => 9; + public override int BasePoisonResistance => 5; + public override int BaseEnergyResistance => 5; - public override int InitMinHits{ get{ return 20; } } - public override int InitMaxHits{ get{ return 30; } } + public override int InitMinHits => 20; + public override int InitMaxHits => 30; [Constructible] public Cap() : this( 0 ) @@ -331,14 +331,14 @@ namespace Server.Items public class SkullCap : BaseHat { - public override int BasePhysicalResistance{ get{ return 0; } } - public override int BaseFireResistance{ get{ return 3; } } - public override int BaseColdResistance{ get{ return 5; } } - public override int BasePoisonResistance{ get{ return 8; } } - public override int BaseEnergyResistance{ get{ return 8; } } + public override int BasePhysicalResistance => 0; + public override int BaseFireResistance => 3; + public override int BaseColdResistance => 5; + public override int BasePoisonResistance => 8; + public override int BaseEnergyResistance => 8; - public override int InitMinHits{ get{ return ( Core.ML ? 14 : 7 ); } } - public override int InitMaxHits{ get{ return ( Core.ML ? 28 : 12 ); } } + public override int InitMinHits => ( Core.ML ? 14 : 7 ); + public override int InitMaxHits => ( Core.ML ? 28 : 12 ); [Constructible] public SkullCap() : this( 0 ) @@ -372,14 +372,14 @@ namespace Server.Items public class Bandana : BaseHat { - public override int BasePhysicalResistance{ get{ return 0; } } - public override int BaseFireResistance{ get{ return 3; } } - public override int BaseColdResistance{ get{ return 5; } } - public override int BasePoisonResistance{ get{ return 8; } } - public override int BaseEnergyResistance{ get{ return 8; } } + public override int BasePhysicalResistance => 0; + public override int BaseFireResistance => 3; + public override int BaseColdResistance => 5; + public override int BasePoisonResistance => 8; + public override int BaseEnergyResistance => 8; - public override int InitMinHits{ get{ return 20; } } - public override int InitMaxHits{ get{ return 30; } } + public override int InitMinHits => 20; + public override int InitMaxHits => 30; [Constructible] public Bandana() : this( 0 ) @@ -413,14 +413,14 @@ namespace Server.Items public class BearMask : BaseHat { - public override int BasePhysicalResistance{ get{ return 5; } } - public override int BaseFireResistance{ get{ return 3; } } - public override int BaseColdResistance{ get{ return 8; } } - public override int BasePoisonResistance{ get{ return 4; } } - public override int BaseEnergyResistance{ get{ return 4; } } + public override int BasePhysicalResistance => 5; + public override int BaseFireResistance => 3; + public override int BaseColdResistance => 8; + public override int BasePoisonResistance => 4; + public override int BaseEnergyResistance => 4; - public override int InitMinHits{ get{ return 20; } } - public override int InitMaxHits{ get{ return 30; } } + public override int InitMinHits => 20; + public override int InitMaxHits => 30; [Constructible] public BearMask() : this( 0 ) @@ -460,14 +460,14 @@ namespace Server.Items public class DeerMask : BaseHat { - public override int BasePhysicalResistance{ get{ return 2; } } - public override int BaseFireResistance{ get{ return 6; } } - public override int BaseColdResistance{ get{ return 8; } } - public override int BasePoisonResistance{ get{ return 1; } } - public override int BaseEnergyResistance{ get{ return 7; } } + public override int BasePhysicalResistance => 2; + public override int BaseFireResistance => 6; + public override int BaseColdResistance => 8; + public override int BasePoisonResistance => 1; + public override int BaseEnergyResistance => 7; - public override int InitMinHits{ get{ return 20; } } - public override int InitMaxHits{ get{ return 30; } } + public override int InitMinHits => 20; + public override int InitMaxHits => 30; [Constructible] public DeerMask() : this( 0 ) @@ -507,14 +507,14 @@ namespace Server.Items public class HornedTribalMask : BaseHat { - public override int BasePhysicalResistance{ get{ return 6; } } - public override int BaseFireResistance{ get{ return 9; } } - public override int BaseColdResistance{ get{ return 0; } } - public override int BasePoisonResistance{ get{ return 4; } } - public override int BaseEnergyResistance{ get{ return 5; } } + public override int BasePhysicalResistance => 6; + public override int BaseFireResistance => 9; + public override int BaseColdResistance => 0; + public override int BasePoisonResistance => 4; + public override int BaseEnergyResistance => 5; - public override int InitMinHits{ get{ return 20; } } - public override int InitMaxHits{ get{ return 30; } } + public override int InitMinHits => 20; + public override int InitMaxHits => 30; [Constructible] public HornedTribalMask() : this( 0 ) @@ -554,14 +554,14 @@ namespace Server.Items public class TribalMask : BaseHat { - public override int BasePhysicalResistance{ get{ return 3; } } - public override int BaseFireResistance{ get{ return 0; } } - public override int BaseColdResistance{ get{ return 6; } } - public override int BasePoisonResistance{ get{ return 10; } } - public override int BaseEnergyResistance{ get{ return 5; } } + public override int BasePhysicalResistance => 3; + public override int BaseFireResistance => 0; + public override int BaseColdResistance => 6; + public override int BasePoisonResistance => 10; + public override int BaseEnergyResistance => 5; - public override int InitMinHits{ get{ return 20; } } - public override int InitMaxHits{ get{ return 30; } } + public override int InitMinHits => 20; + public override int InitMaxHits => 30; [Constructible] public TribalMask() : this( 0 ) @@ -601,14 +601,14 @@ namespace Server.Items public class TallStrawHat : BaseHat { - public override int BasePhysicalResistance{ get{ return 0; } } - public override int BaseFireResistance{ get{ return 5; } } - public override int BaseColdResistance{ get{ return 9; } } - public override int BasePoisonResistance{ get{ return 5; } } - public override int BaseEnergyResistance{ get{ return 5; } } + public override int BasePhysicalResistance => 0; + public override int BaseFireResistance => 5; + public override int BaseColdResistance => 9; + public override int BasePoisonResistance => 5; + public override int BaseEnergyResistance => 5; - public override int InitMinHits{ get{ return 20; } } - public override int InitMaxHits{ get{ return 30; } } + public override int InitMinHits => 20; + public override int InitMaxHits => 30; [Constructible] public TallStrawHat() : this( 0 ) @@ -642,14 +642,14 @@ namespace Server.Items public class StrawHat : BaseHat { - public override int BasePhysicalResistance{ get{ return 0; } } - public override int BaseFireResistance{ get{ return 5; } } - public override int BaseColdResistance{ get{ return 9; } } - public override int BasePoisonResistance{ get{ return 5; } } - public override int BaseEnergyResistance{ get{ return 5; } } + public override int BasePhysicalResistance => 0; + public override int BaseFireResistance => 5; + public override int BaseColdResistance => 9; + public override int BasePoisonResistance => 5; + public override int BaseEnergyResistance => 5; - public override int InitMinHits{ get{ return 20; } } - public override int InitMaxHits{ get{ return 30; } } + public override int InitMinHits => 20; + public override int InitMaxHits => 30; [Constructible] public StrawHat() : this( 0 ) @@ -683,14 +683,14 @@ namespace Server.Items public class OrcishKinMask : BaseHat { - public override int BasePhysicalResistance{ get{ return 1; } } - public override int BaseFireResistance{ get{ return 1; } } - public override int BaseColdResistance{ get{ return 7; } } - public override int BasePoisonResistance{ get{ return 7; } } - public override int BaseEnergyResistance{ get{ return 8; } } + public override int BasePhysicalResistance => 1; + public override int BaseFireResistance => 1; + public override int BaseColdResistance => 7; + public override int BasePoisonResistance => 7; + public override int BaseEnergyResistance => 8; - public override int InitMinHits{ get{ return 20; } } - public override int InitMaxHits{ get{ return 30; } } + public override int InitMinHits => 20; + public override int InitMaxHits => 30; public override bool Dye( Mobile from, DyeTub sender ) { @@ -760,14 +760,14 @@ namespace Server.Items public class SavageMask : BaseHat { - public override int BasePhysicalResistance{ get{ return 3; } } - public override int BaseFireResistance{ get{ return 0; } } - public override int BaseColdResistance{ get{ return 6; } } - public override int BasePoisonResistance{ get{ return 10; } } - public override int BaseEnergyResistance{ get{ return 5; } } + public override int BasePhysicalResistance => 3; + public override int BaseFireResistance => 0; + public override int BaseColdResistance => 6; + public override int BasePoisonResistance => 10; + public override int BaseEnergyResistance => 5; - public override int InitMinHits{ get{ return 20; } } - public override int InitMaxHits{ get{ return 30; } } + public override int InitMinHits => 20; + public override int InitMaxHits => 30; public static int GetRandomHue() { @@ -820,14 +820,14 @@ namespace Server.Items public class WizardsHat : BaseHat { - public override int BasePhysicalResistance{ get{ return 0; } } - public override int BaseFireResistance{ get{ return 5; } } - public override int BaseColdResistance{ get{ return 9; } } - public override int BasePoisonResistance{ get{ return 5; } } - public override int BaseEnergyResistance{ get{ return 5; } } + public override int BasePhysicalResistance => 0; + public override int BaseFireResistance => 5; + public override int BaseColdResistance => 9; + public override int BasePoisonResistance => 5; + public override int BaseEnergyResistance => 5; - public override int InitMinHits{ get{ return 20; } } - public override int InitMaxHits{ get{ return 30; } } + public override int InitMinHits => 20; + public override int InitMaxHits => 30; [Constructible] public WizardsHat() : this( 0 ) @@ -861,20 +861,20 @@ namespace Server.Items public class MagicWizardsHat : BaseHat { - public override int BasePhysicalResistance{ get{ return 0; } } - public override int BaseFireResistance{ get{ return 5; } } - public override int BaseColdResistance{ get{ return 9; } } - public override int BasePoisonResistance{ get{ return 5; } } - public override int BaseEnergyResistance{ get{ return 5; } } + public override int BasePhysicalResistance => 0; + public override int BaseFireResistance => 5; + public override int BaseColdResistance => 9; + public override int BasePoisonResistance => 5; + public override int BaseEnergyResistance => 5; - public override int InitMinHits{ get{ return 20; } } - public override int InitMaxHits{ get{ return 30; } } + public override int InitMinHits => 20; + public override int InitMaxHits => 30; - public override int LabelNumber{ get{ return 1041072; } } // a magical wizard's hat + public override int LabelNumber => 1041072; // a magical wizard's hat - public override int BaseStrBonus{ get{ return -5; } } - public override int BaseDexBonus{ get{ return -5; } } - public override int BaseIntBonus{ get{ return +5; } } + public override int BaseStrBonus => -5; + public override int BaseDexBonus => -5; + public override int BaseIntBonus => +5; [Constructible] public MagicWizardsHat() : this( 0 ) @@ -908,14 +908,14 @@ namespace Server.Items public class Bonnet : BaseHat { - public override int BasePhysicalResistance{ get{ return 0; } } - public override int BaseFireResistance{ get{ return 5; } } - public override int BaseColdResistance{ get{ return 9; } } - public override int BasePoisonResistance{ get{ return 5; } } - public override int BaseEnergyResistance{ get{ return 5; } } + public override int BasePhysicalResistance => 0; + public override int BaseFireResistance => 5; + public override int BaseColdResistance => 9; + public override int BasePoisonResistance => 5; + public override int BaseEnergyResistance => 5; - public override int InitMinHits{ get{ return 20; } } - public override int InitMaxHits{ get{ return 30; } } + public override int InitMinHits => 20; + public override int InitMaxHits => 30; [Constructible] public Bonnet() : this( 0 ) @@ -949,14 +949,14 @@ namespace Server.Items public class FeatheredHat : BaseHat { - public override int BasePhysicalResistance{ get{ return 0; } } - public override int BaseFireResistance{ get{ return 5; } } - public override int BaseColdResistance{ get{ return 9; } } - public override int BasePoisonResistance{ get{ return 5; } } - public override int BaseEnergyResistance{ get{ return 5; } } + public override int BasePhysicalResistance => 0; + public override int BaseFireResistance => 5; + public override int BaseColdResistance => 9; + public override int BasePoisonResistance => 5; + public override int BaseEnergyResistance => 5; - public override int InitMinHits{ get{ return 20; } } - public override int InitMaxHits{ get{ return 30; } } + public override int InitMinHits => 20; + public override int InitMaxHits => 30; [Constructible] public FeatheredHat() : this( 0 ) @@ -990,14 +990,14 @@ namespace Server.Items public class TricorneHat : BaseHat { - public override int BasePhysicalResistance{ get{ return 0; } } - public override int BaseFireResistance{ get{ return 5; } } - public override int BaseColdResistance{ get{ return 9; } } - public override int BasePoisonResistance{ get{ return 5; } } - public override int BaseEnergyResistance{ get{ return 5; } } + public override int BasePhysicalResistance => 0; + public override int BaseFireResistance => 5; + public override int BaseColdResistance => 9; + public override int BasePoisonResistance => 5; + public override int BaseEnergyResistance => 5; - public override int InitMinHits{ get{ return 20; } } - public override int InitMaxHits{ get{ return 30; } } + public override int InitMinHits => 20; + public override int InitMaxHits => 30; [Constructible] public TricorneHat() : this( 0 ) @@ -1031,14 +1031,14 @@ namespace Server.Items public class JesterHat : BaseHat { - public override int BasePhysicalResistance{ get{ return 0; } } - public override int BaseFireResistance{ get{ return 5; } } - public override int BaseColdResistance{ get{ return 9; } } - public override int BasePoisonResistance{ get{ return 5; } } - public override int BaseEnergyResistance{ get{ return 5; } } + public override int BasePhysicalResistance => 0; + public override int BaseFireResistance => 5; + public override int BaseColdResistance => 9; + public override int BasePoisonResistance => 5; + public override int BaseEnergyResistance => 5; - public override int InitMinHits{ get{ return 20; } } - public override int InitMaxHits{ get{ return 30; } } + public override int InitMinHits => 20; + public override int InitMaxHits => 30; [Constructible] public JesterHat() : this( 0 ) @@ -1069,4 +1069,4 @@ namespace Server.Items int version = reader.ReadInt(); } } -} \ No newline at end of file +} diff --git a/Scripts/Items/Clothing/OuterTorso.cs b/Scripts/Items/Clothing/OuterTorso.cs index b7a337f33..c11eefefb 100644 --- a/Scripts/Items/Clothing/OuterTorso.cs +++ b/Scripts/Items/Clothing/OuterTorso.cs @@ -263,7 +263,7 @@ namespace Server.Items } } - public override int BasePhysicalResistance{ get{ return 3; } } + public override int BasePhysicalResistance => 3; public override void OnAdded(IEntity parent) { @@ -388,7 +388,7 @@ namespace Server.Items } } - public override int BasePhysicalResistance{ get{ return 3; } } + public override int BasePhysicalResistance => 3; public override void OnAdded(IEntity parent) { @@ -615,7 +615,7 @@ namespace Server.Items Weight = 1.0; StrRequirement = 0; } - public override int LabelNumber{ get{ return 1076584; } } // A monk's robe + public override int LabelNumber => 1076584; // A monk's robe public override bool CanBeBlessed => false; public override bool Dye( Mobile from, DyeTub sender ) { @@ -815,7 +815,7 @@ namespace Server.Items [Flippable( 0x2FB9, 0x3173 )] public class MaleElvenRobe : BaseOuterTorso { - public override Race RequiredRace { get { return Race.Elf; } } + public override Race RequiredRace => Race.Elf; [Constructible] public MaleElvenRobe() : this( 0 ) @@ -850,7 +850,7 @@ namespace Server.Items [Flippable( 0x2FBA, 0x3174 )] public class FemaleElvenRobe : BaseOuterTorso { - public override Race RequiredRace { get { return Race.Elf; } } + public override Race RequiredRace => Race.Elf; [Constructible] public FemaleElvenRobe() : this( 0 ) { diff --git a/Scripts/Items/Clothing/Pants.cs b/Scripts/Items/Clothing/Pants.cs index b2c95b5c4..0f79df0c1 100644 --- a/Scripts/Items/Clothing/Pants.cs +++ b/Scripts/Items/Clothing/Pants.cs @@ -133,7 +133,7 @@ namespace Server.Items [FlippableAttribute( 0x2FC3, 0x3179 )] public class ElvenPants : BasePants { - public override Race RequiredRace { get { return Race.Elf; } } + public override Race RequiredRace => Race.Elf; [Constructible] public ElvenPants() : this( 0 ) @@ -164,4 +164,4 @@ namespace Server.Items int version = reader.ReadEncodedInt(); } } -} \ No newline at end of file +} diff --git a/Scripts/Items/Clothing/Shirts.cs b/Scripts/Items/Clothing/Shirts.cs index a61ef6236..f7534b628 100644 --- a/Scripts/Items/Clothing/Shirts.cs +++ b/Scripts/Items/Clothing/Shirts.cs @@ -136,7 +136,7 @@ namespace Server.Items public class ElvenShirt : BaseShirt { - public override Race RequiredRace { get { return Race.Elf; } } + public override Race RequiredRace => Race.Elf; [Constructible] public ElvenShirt() : this( 0 ) @@ -171,7 +171,7 @@ namespace Server.Items public class ElvenDarkShirt : BaseShirt { - public override Race RequiredRace { get { return Race.Elf; } } + public override Race RequiredRace => Race.Elf; [Constructible] public ElvenDarkShirt() : this( 0 ) { @@ -201,4 +201,4 @@ namespace Server.Items int version = reader.ReadEncodedInt(); } } -} \ No newline at end of file +} diff --git a/Scripts/Items/Clothing/Shoes.cs b/Scripts/Items/Clothing/Shoes.cs index 2cade0abb..53cf7c3e3 100644 --- a/Scripts/Items/Clothing/Shoes.cs +++ b/Scripts/Items/Clothing/Shoes.cs @@ -91,7 +91,7 @@ namespace Server.Items [FlippableAttribute( 0x170b, 0x170c )] public class Boots : BaseShoes { - public override CraftResource DefaultResource{ get{ return CraftResource.RegularLeather; } } + public override CraftResource DefaultResource => CraftResource.RegularLeather; [Constructible] public Boots() : this( 0 ) @@ -185,7 +185,7 @@ namespace Server.Items } #endregion - public override CraftResource DefaultResource{ get{ return CraftResource.RegularLeather; } } + public override CraftResource DefaultResource => CraftResource.RegularLeather; [Constructible] public ThighBoots() : this( 0 ) @@ -248,7 +248,7 @@ namespace Server.Items [FlippableAttribute( 0x170f, 0x1710 )] public class Shoes : BaseShoes { - public override CraftResource DefaultResource{ get{ return CraftResource.RegularLeather; } } + public override CraftResource DefaultResource => CraftResource.RegularLeather; [Constructible] public Shoes() : this( 0 ) @@ -283,7 +283,7 @@ namespace Server.Items [FlippableAttribute( 0x170d, 0x170e )] public class Sandals : BaseShoes { - public override CraftResource DefaultResource{ get{ return CraftResource.RegularLeather; } } + public override CraftResource DefaultResource => CraftResource.RegularLeather; [Constructible] public Sandals() : this( 0 ) @@ -422,9 +422,9 @@ namespace Server.Items [FlippableAttribute( 0x2FC4, 0x317A )] public class ElvenBoots : BaseShoes { - public override CraftResource DefaultResource{ get{ return CraftResource.RegularLeather; } } + public override CraftResource DefaultResource => CraftResource.RegularLeather; - public override Race RequiredRace { get { return Race.Elf; } } + public override Race RequiredRace => Race.Elf; [Constructible] public ElvenBoots() : this( 0 ) diff --git a/Scripts/Items/Clothing/Waist.cs b/Scripts/Items/Clothing/Waist.cs index e22851df1..88d46dfc2 100644 --- a/Scripts/Items/Clothing/Waist.cs +++ b/Scripts/Items/Clothing/Waist.cs @@ -101,7 +101,7 @@ namespace Server.Items [FlippableAttribute( 0x2B68, 0x315F )] public class WoodlandBelt : BaseWaist { - public override Race RequiredRace { get { return Race.Elf; } } + public override Race RequiredRace => Race.Elf; [Constructible] public WoodlandBelt() : this( 0 ) diff --git a/Scripts/Items/Construction/Misc/BarrelParts.cs b/Scripts/Items/Construction/Misc/BarrelParts.cs index df8e98d0e..bf7d8d033 100644 --- a/Scripts/Items/Construction/Misc/BarrelParts.cs +++ b/Scripts/Items/Construction/Misc/BarrelParts.cs @@ -59,7 +59,7 @@ namespace Server.Items public class BarrelHoops : Item { - public override int LabelNumber { get { return 1011228; } } // Barrel hoops + public override int LabelNumber => 1011228; // Barrel hoops [Constructible] public BarrelHoops() : base(0x1DB7) @@ -112,4 +112,4 @@ namespace Server.Items int version = reader.ReadInt(); } } -} \ No newline at end of file +} diff --git a/Scripts/Items/Construction/Misc/MeltedWax.cs b/Scripts/Items/Construction/Misc/MeltedWax.cs index d8e4f7011..884b64620 100644 --- a/Scripts/Items/Construction/Misc/MeltedWax.cs +++ b/Scripts/Items/Construction/Misc/MeltedWax.cs @@ -4,7 +4,7 @@ namespace Server.Items { public class MeltedWax : Item { - public override int LabelNumber{ get{ return 1016492; } } // melted wax + public override int LabelNumber => 1016492; // melted wax [Constructible] public MeltedWax() : base( 0x122A ) @@ -31,4 +31,4 @@ namespace Server.Items int version = reader.ReadInt(); } } -} \ No newline at end of file +} diff --git a/Scripts/Items/Construction/Misc/Obelisk.cs b/Scripts/Items/Construction/Misc/Obelisk.cs index 39558b406..489b6e106 100644 --- a/Scripts/Items/Construction/Misc/Obelisk.cs +++ b/Scripts/Items/Construction/Misc/Obelisk.cs @@ -4,7 +4,7 @@ namespace Server.Items { public class Obelisk : Item { - public override int LabelNumber{ get{ return 1016474; } } // an obelisk + public override int LabelNumber => 1016474; // an obelisk [Constructible] public Obelisk() : base(0x1184) @@ -30,4 +30,4 @@ namespace Server.Items int version = reader.ReadInt(); } } -} \ No newline at end of file +} diff --git a/Scripts/Items/Construction/Signs/LocalizedSign.cs b/Scripts/Items/Construction/Signs/LocalizedSign.cs index e0b260fdc..56b00b9e2 100644 --- a/Scripts/Items/Construction/Signs/LocalizedSign.cs +++ b/Scripts/Items/Construction/Signs/LocalizedSign.cs @@ -7,7 +7,7 @@ namespace Server.Items { private int m_LabelNumber; - public override int LabelNumber{ get{ return m_LabelNumber; } } + public override int LabelNumber => m_LabelNumber; [CommandProperty( AccessLevel.GameMaster )] public int Number{ get{ return m_LabelNumber; } set{ m_LabelNumber = value; InvalidateProperties(); } } @@ -53,4 +53,4 @@ namespace Server.Items } } } -} \ No newline at end of file +} diff --git a/Scripts/Items/Containers/Container.cs b/Scripts/Items/Containers/Container.cs index cdf2607d0..3ee21ecf7 100644 --- a/Scripts/Items/Containers/Container.cs +++ b/Scripts/Items/Containers/Container.cs @@ -234,7 +234,7 @@ namespace Server.Items return base.CheckHold( m, item, false, checkItems, plusItems, plusWeight ); } - public override int DefaultMaxWeight{ get{ return 1600; } } + public override int DefaultMaxWeight => 1600; public override bool CheckContentDisplay( Mobile from ) { @@ -957,7 +957,7 @@ namespace Server.Items if ( version == 0 && Weight == 15 ) Weight = -1; - + if ( version < 2 ) GumpID = 0x10B; } @@ -993,4 +993,4 @@ namespace Server.Items Weight = -1; } } -} \ No newline at end of file +} diff --git a/Scripts/Items/Containers/FillableContainers.cs b/Scripts/Items/Containers/FillableContainers.cs index 9cce6f4cf..df34642cb 100644 --- a/Scripts/Items/Containers/FillableContainers.cs +++ b/Scripts/Items/Containers/FillableContainers.cs @@ -7,13 +7,13 @@ namespace Server.Items { public abstract class FillableContainer : LockableContainer { - public virtual int MinRespawnMinutes { get { return 60; } } - public virtual int MaxRespawnMinutes { get { return 90; } } + public virtual int MinRespawnMinutes => 60; + public virtual int MaxRespawnMinutes => 90; - public virtual bool IsLockable { get { return true; } } - public virtual bool IsTrappable { get { return IsLockable; } } + public virtual bool IsLockable => true; + public virtual bool IsTrappable => IsLockable; - public virtual int SpawnThreshold { get { return 2; } } + public virtual int SpawnThreshold => 2; protected FillableContent m_Content; @@ -21,7 +21,7 @@ namespace Server.Items protected Timer m_RespawnTimer; [CommandProperty( AccessLevel.GameMaster )] - public DateTime NextRespawnTime { get { return m_NextRespawnTime; } } + public DateTime NextRespawnTime => m_NextRespawnTime; [CommandProperty( AccessLevel.GameMaster )] public FillableContentType ContentType @@ -275,7 +275,7 @@ namespace Server.Items public class LibraryBookcase : FillableContainer { public override bool IsLockable => false; - public override int SpawnThreshold { get { return 5; } } + public override int SpawnThreshold => 5; protected override int GetSpawnCount() { @@ -579,8 +579,8 @@ namespace Server.Items protected Type[] m_Types; protected int m_Weight; - public Type[] Types { get { return m_Types; } } - public int Weight { get { return m_Weight; } } + public Type[] Types => m_Types; + public int Weight => m_Weight; public FillableEntry( Type type ) : this( 1, new Type[] { type } ) @@ -631,7 +631,7 @@ namespace Server.Items { private BeverageType m_Content; - public BeverageType Content { get { return m_Content; } } + public BeverageType Content => m_Content; public FillableBvrge( Type type, BeverageType content ) : this( 1, type, content ) @@ -700,8 +700,8 @@ namespace Server.Items private FillableEntry[] m_Entries; private int m_Weight; - public int Level { get { return m_Level; } } - public Type[] Vendors { get { return m_Vendors; } } + public int Level => m_Level; + public Type[] Vendors => m_Vendors; public FillableContentType TypeID { get { return Lookup( this ); } } diff --git a/Scripts/Items/Containers/FurnitureContainer.cs b/Scripts/Items/Containers/FurnitureContainer.cs index 312cf9485..b8bc3374f 100644 --- a/Scripts/Items/Containers/FurnitureContainer.cs +++ b/Scripts/Items/Containers/FurnitureContainer.cs @@ -385,9 +385,7 @@ namespace Server.Items public static void Close( Container c ) { - Timer t = null; - - m_Table.TryGetValue( c, out t ); + m_Table.TryGetValue( c, out Timer t ); if ( t != null ) { @@ -427,4 +425,4 @@ namespace Server.Items DynamicFurniture.Close( m_Container ); } } -} \ No newline at end of file +} diff --git a/Scripts/Items/Containers/MarkContainer.cs b/Scripts/Items/Containers/MarkContainer.cs index e9462d4d2..7279a543f 100644 --- a/Scripts/Items/Containers/MarkContainer.cs +++ b/Scripts/Items/Containers/MarkContainer.cs @@ -166,8 +166,8 @@ namespace Server.Items private MarkContainer m_Container; private DateTime m_RelockTime; - public MarkContainer Container { get { return m_Container; } } - public DateTime RelockTime { get { return m_RelockTime; } } + public MarkContainer Container => m_Container; + public DateTime RelockTime => m_RelockTime; public InternalTimer( MarkContainer container ) : this( container, TimeSpan.FromMinutes( 5.0 ) ) { diff --git a/Scripts/Items/Containers/SalvageBag.cs b/Scripts/Items/Containers/SalvageBag.cs index 9fd0c8e55..496a5e10c 100644 --- a/Scripts/Items/Containers/SalvageBag.cs +++ b/Scripts/Items/Containers/SalvageBag.cs @@ -11,8 +11,8 @@ namespace Server.Items public class SalvageBag : Bag { private bool m_Failure; - - public override int LabelNumber { get { return 1079931; } } // Salvage Bag + + public override int LabelNumber => 1079931; // Salvage Bag [Constructible] public SalvageBag() @@ -39,7 +39,7 @@ namespace Server.Items list.Add( new SalvageAllEntry( this, IsChildOf( from.Backpack ) && Resmeltables() && Scissorables() ) ); } } - + #region Checks private bool Resmeltables() //Where context menu checks for metal items and dragon barding deeds { @@ -63,7 +63,7 @@ namespace Server.Items } return false; } - + private bool Scissorables() //Where context menu checks for Leather items and cloth items { foreach( Item i in Items ) @@ -86,7 +86,7 @@ namespace Server.Items } return false; } - #endregion + #endregion #region Resmelt.cs private bool Resmelt( Mobile from, Item item, CraftResource resource ) @@ -110,7 +110,7 @@ namespace Server.Items if( craftResource.Amount < 2 ) return false; // Not enough metal to resmelt - + double difficulty = 0.0; switch ( resource ) @@ -123,7 +123,7 @@ namespace Server.Items case CraftResource.Agapite: difficulty = 90.0; break; case CraftResource.Verite: difficulty = 95.0; break; case CraftResource.Valorite: difficulty = 99.0; break; - } + } Type resourceType = info.ResourceTypes[ 0 ]; Item ingot = (Item)Activator.CreateInstance( resourceType ); @@ -143,10 +143,10 @@ namespace Server.Items { ingot.Amount = 2; } - + if ( difficulty > from.Skills[ SkillName.Mining ].Value ) { - m_Failure = true; + m_Failure = true; ingot.Delete(); } else @@ -167,7 +167,7 @@ namespace Server.Items return false; } #endregion - + #region Salvaging private void SalvageIngots( Mobile from ) { @@ -197,15 +197,15 @@ namespace Server.Items int salvaged = 0; int notSalvaged = 0; - + Container sBag = this; - + List Smeltables = sBag.FindItemsByType(); for(int i = Smeltables.Count - 1; i >= 0; i--) { Item item = Smeltables[ i ]; - + if( item is BaseArmor ) { if( Resmelt( from, item, ( (BaseArmor)item ).Resource ) ) @@ -227,7 +227,7 @@ namespace Server.Items else notSalvaged++; - } + } } if( m_Failure ) { @@ -249,9 +249,9 @@ namespace Server.Items int salvaged = 0; int notSalvaged = 0; - + Container sBag = this; - + List scissorables = sBag.FindItemsByType(); for ( int i = scissorables.Count - 1; i >= 0; --i ) @@ -268,18 +268,18 @@ namespace Server.Items ++notSalvaged; } } - + from.SendLocalizedMessage( 1079974, String.Format( "{0}\t{1}", salvaged, salvaged + notSalvaged ) ); // Salvaged: ~1_COUNT~/~2_NUM~ tailored items - + Container pack = from.Backpack; - + foreach (Item i in ((Container)this).FindItemsByType(typeof(Item), true)) { if( ( i is Leather ) || ( i is Cloth ) || ( i is SpinedLeather ) || ( i is HornedLeather ) || ( i is BarbedLeather ) || ( i is Bandage ) || ( i is Bone ) ) { from.AddToBackpack( i ); } - } + } } private void SalvageAll( Mobile from ) diff --git a/Scripts/Items/Containers/Strongbox.cs b/Scripts/Items/Containers/Strongbox.cs index 984253f45..fac7058d2 100644 --- a/Scripts/Items/Containers/Strongbox.cs +++ b/Scripts/Items/Containers/Strongbox.cs @@ -12,8 +12,8 @@ namespace Server.Items private Mobile m_Owner; private BaseHouse m_House; - public override double DefaultWeight{ get{ return 100; } } - public override int LabelNumber { get { return 1023712; } } + public override double DefaultWeight => 100; + public override int LabelNumber => 1023712; public StrongBox( Mobile owner, BaseHouse house ) : base( 0xE80 ) { @@ -37,7 +37,7 @@ namespace Server.Items } } - public override int DefaultMaxWeight{ get{ return 0; } } + public override int DefaultMaxWeight => 0; public StrongBox( Serial serial ) : base(serial) { diff --git a/Scripts/Items/Containers/TreasureMapChest.cs b/Scripts/Items/Containers/TreasureMapChest.cs index 6efbca871..7d31fc2f8 100644 --- a/Scripts/Items/Containers/TreasureMapChest.cs +++ b/Scripts/Items/Containers/TreasureMapChest.cs @@ -11,9 +11,9 @@ namespace Server.Items { public class TreasureMapChest : LockableContainer { - public override int LabelNumber{ get{ return 3000541; } } + public override int LabelNumber => 3000541; - public static Type[] Artifacts { get { return m_Artifacts; } } + public static Type[] Artifacts => m_Artifacts; private static Type[] m_Artifacts = new Type[] { @@ -46,7 +46,7 @@ namespace Server.Items [CommandProperty( AccessLevel.GameMaster )] public bool Temporary{ get{ return m_Temporary; } set{ m_Temporary = value; } } - public List Guardians { get { return m_Guardians; } } + public List Guardians => m_Guardians; [Constructible] public TreasureMapChest( int level ) : this( null, level, false ) @@ -71,7 +71,7 @@ namespace Server.Items private static void GetRandomAOSStats( out int attributeCount, out int min, out int max ) { int rnd = Utility.Random( 15 ); - + if ( Core.SE ) { if ( rnd < 1 ) @@ -135,7 +135,7 @@ namespace Server.Items cont.Movable = false; cont.Locked = true; int numberItems; - + if ( level == 0 ) { cont.LockLevel = 0; // Can't be unlocked @@ -163,11 +163,11 @@ namespace Server.Items cont.LockLevel = cont.RequiredSkill - 10; cont.MaxLockLevel = cont.RequiredSkill + 40; - + //Publish 67 gold change //if ( Core.SA ) // cont.DropItem( new Gold( level * 5000 ) ); - //else + //else cont.DropItem( new Gold( level * 1000 ) ); for ( int i = 0; i < level * 5; ++i ) @@ -188,7 +188,7 @@ namespace Server.Items } else numberItems = level * 6; - + for ( int i = 0; i < numberItems; ++i ) { Item item; diff --git a/Scripts/Items/Decoration Artifacts/DoomDecorationArtifacts.cs b/Scripts/Items/Decoration Artifacts/DoomDecorationArtifacts.cs index 5525b2a2a..3970a5a0b 100644 --- a/Scripts/Items/Decoration Artifacts/DoomDecorationArtifacts.cs +++ b/Scripts/Items/Decoration Artifacts/DoomDecorationArtifacts.cs @@ -6,7 +6,7 @@ namespace Server.Items #region BackpackArtifact public class BackpackArtifact : BaseDecorationContainerArtifact { - public override int ArtifactRarity{ get{ return 5; } } + public override int ArtifactRarity => 5; [Constructible] public BackpackArtifact() : base( 0x9B2 ) @@ -36,7 +36,7 @@ namespace Server.Items #region BloodyWaterArtifact public class BloodyWaterArtifact : BaseDecorationArtifact { - public override int ArtifactRarity{ get{ return 5; } } + public override int ArtifactRarity => 5; [Constructible] public BloodyWaterArtifact() : base( 0xE23 ) @@ -66,7 +66,7 @@ namespace Server.Items #region BooksWestArtifact public class BooksWestArtifact : BaseDecorationArtifact { - public override int ArtifactRarity{ get{ return 3; } } + public override int ArtifactRarity => 3; [Constructible] public BooksWestArtifact() : base( 0x1E25 ) @@ -96,7 +96,7 @@ namespace Server.Items #region BooksNorthArtifact public class BooksNorthArtifact : BaseDecorationArtifact { - public override int ArtifactRarity{ get{ return 3; } } + public override int ArtifactRarity => 3; [Constructible] public BooksNorthArtifact() : base( 0x1E24 ) @@ -126,7 +126,7 @@ namespace Server.Items #region BooksFaceDownArtifact public class BooksFaceDownArtifact : BaseDecorationArtifact { - public override int ArtifactRarity{ get{ return 3; } } + public override int ArtifactRarity => 3; [Constructible] public BooksFaceDownArtifact() : base( 0x1E21 ) @@ -156,7 +156,7 @@ namespace Server.Items #region BottleArtifact public class BottleArtifact : BaseDecorationArtifact { - public override int ArtifactRarity{ get{ return 1; } } + public override int ArtifactRarity => 1; [Constructible] public BottleArtifact() : base( 0xE28 ) @@ -186,7 +186,7 @@ namespace Server.Items #region BrazierArtifact public class BrazierArtifact : BaseDecorationArtifact { - public override int ArtifactRarity{ get{ return 2; } } + public override int ArtifactRarity => 2; [Constructible] public BrazierArtifact() : base( 0xE31 ) @@ -217,7 +217,7 @@ namespace Server.Items #region CocoonArtifact public class CocoonArtifact : BaseDecorationArtifact { - public override int ArtifactRarity{ get{ return 7; } } + public override int ArtifactRarity => 7; [Constructible] public CocoonArtifact() : base( 0x10DA ) @@ -247,7 +247,7 @@ namespace Server.Items #region DamagedBooksArtifact public class DamagedBooksArtifact : BaseDecorationArtifact { - public override int ArtifactRarity{ get{ return 1; } } + public override int ArtifactRarity => 1; [Constructible] public DamagedBooksArtifact() : base( 0xC16 ) @@ -277,7 +277,7 @@ namespace Server.Items #region EggCaseArtifact public class EggCaseArtifact : BaseDecorationArtifact { - public override int ArtifactRarity{ get{ return 5; } } + public override int ArtifactRarity => 5; [Constructible] public EggCaseArtifact() : base( 0x10D9 ) @@ -307,7 +307,7 @@ namespace Server.Items #region GruesomeStandardArtifact public class GruesomeStandardArtifact : BaseDecorationArtifact { - public override int ArtifactRarity{ get{ return 5; } } + public override int ArtifactRarity => 5; [Constructible] public GruesomeStandardArtifact() : base( 0x428 ) @@ -337,7 +337,7 @@ namespace Server.Items #region LampPostArtifact public class LampPostArtifact : BaseDecorationArtifact { - public override int ArtifactRarity{ get{ return 3; } } + public override int ArtifactRarity => 3; [Constructible] public LampPostArtifact() : base( 0xB24 ) @@ -368,7 +368,7 @@ namespace Server.Items #region LeatherTunicArtifact public class LeatherTunicArtifact : BaseDecorationArtifact { - public override int ArtifactRarity{ get{ return 9; } } + public override int ArtifactRarity => 9; [Constructible] public LeatherTunicArtifact() : base( 0x13CA ) @@ -398,7 +398,7 @@ namespace Server.Items #region RockArtifact public class RockArtifact : BaseDecorationArtifact { - public override int ArtifactRarity{ get{ return 1; } } + public override int ArtifactRarity => 1; [Constructible] public RockArtifact() : base( 0x1363 ) @@ -428,7 +428,7 @@ namespace Server.Items #region RuinedPaintingArtifact public class RuinedPaintingArtifact : BaseDecorationArtifact { - public override int ArtifactRarity{ get{ return 12; } } + public override int ArtifactRarity => 12; [Constructible] public RuinedPaintingArtifact() : base( 0xC2C ) @@ -458,7 +458,7 @@ namespace Server.Items #region SaddleArtifact public class SaddleArtifact : BaseDecorationArtifact { - public override int ArtifactRarity{ get{ return 9; } } + public override int ArtifactRarity => 9; [Constructible] public SaddleArtifact() : base( 0xF38 ) @@ -488,7 +488,7 @@ namespace Server.Items #region SkinnedDeerArtifact public class SkinnedDeerArtifact : BaseDecorationArtifact { - public override int ArtifactRarity{ get{ return 8; } } + public override int ArtifactRarity => 8; [Constructible] public SkinnedDeerArtifact() : base( 0x1E91 ) @@ -518,7 +518,7 @@ namespace Server.Items #region SkinnedGoatArtifact public class SkinnedGoatArtifact : BaseDecorationArtifact { - public override int ArtifactRarity{ get{ return 5; } } + public override int ArtifactRarity => 5; [Constructible] public SkinnedGoatArtifact() : base( 0x1E88 ) @@ -548,7 +548,7 @@ namespace Server.Items #region SkullCandleArtifact public class SkullCandleArtifact : BaseDecorationArtifact { - public override int ArtifactRarity{ get{ return 1; } } + public override int ArtifactRarity => 1; [Constructible] public SkullCandleArtifact() : base( 0x1858 ) @@ -579,7 +579,7 @@ namespace Server.Items #region StretchedHideArtifact public class StretchedHideArtifact : BaseDecorationArtifact { - public override int ArtifactRarity{ get{ return 2; } } + public override int ArtifactRarity => 2; [Constructible] public StretchedHideArtifact() : base( 0x106B ) @@ -609,7 +609,7 @@ namespace Server.Items #region StuddedLeggingsArtifact public class StuddedLeggingsArtifact : BaseDecorationArtifact { - public override int ArtifactRarity{ get{ return 5; } } + public override int ArtifactRarity => 5; [Constructible] public StuddedLeggingsArtifact() : base( 0x13D8 ) @@ -639,7 +639,7 @@ namespace Server.Items #region StuddedTunicArtifact public class StuddedTunicArtifact : BaseDecorationArtifact { - public override int ArtifactRarity{ get{ return 7; } } + public override int ArtifactRarity => 7; [Constructible] public StuddedTunicArtifact() : base( 0x13D9 ) @@ -669,7 +669,7 @@ namespace Server.Items #region TarotCardsArtifact public class TarotCardsArtifact : BaseDecorationArtifact { - public override int ArtifactRarity{ get{ return 5; } } + public override int ArtifactRarity => 5; [Constructible] public TarotCardsArtifact() : base( 0x12A5 ) @@ -695,4 +695,4 @@ namespace Server.Items } } #endregion -} \ No newline at end of file +} diff --git a/Scripts/Items/Decoration Artifacts/SEDecorationArtifacts.cs b/Scripts/Items/Decoration Artifacts/SEDecorationArtifacts.cs index d316c2f50..7528f0dca 100644 --- a/Scripts/Items/Decoration Artifacts/SEDecorationArtifacts.cs +++ b/Scripts/Items/Decoration Artifacts/SEDecorationArtifacts.cs @@ -6,7 +6,7 @@ namespace Server.Items #region Basket1Artifact public class Basket1Artifact : BaseDecorationContainerArtifact { - public override int ArtifactRarity{ get{ return 1; } } + public override int ArtifactRarity => 1; [Constructible] public Basket1Artifact() : base( 0x24DD ) @@ -36,7 +36,7 @@ namespace Server.Items #region Basket2Artifact public class Basket2Artifact : BaseDecorationContainerArtifact { - public override int ArtifactRarity{ get{ return 1; } } + public override int ArtifactRarity => 1; [Constructible] public Basket2Artifact() : base( 0x24D7 ) @@ -66,7 +66,7 @@ namespace Server.Items #region Basket3WestArtifact public class Basket3WestArtifact : BaseDecorationContainerArtifact { - public override int ArtifactRarity{ get{ return 1; } } + public override int ArtifactRarity => 1; [Constructible] public Basket3WestArtifact() : base( 0x24D9 ) @@ -96,7 +96,7 @@ namespace Server.Items #region Basket3NorthArtifact public class Basket3NorthArtifact : BaseDecorationContainerArtifact { - public override int ArtifactRarity{ get{ return 1; } } + public override int ArtifactRarity => 1; [Constructible] public Basket3NorthArtifact() : base( 0x24DA ) @@ -126,7 +126,7 @@ namespace Server.Items #region Basket4Artifact public class Basket4Artifact : BaseDecorationContainerArtifact { - public override int ArtifactRarity{ get{ return 2; } } + public override int ArtifactRarity => 2; [Constructible] public Basket4Artifact() : base( 0x24D8 ) @@ -156,7 +156,7 @@ namespace Server.Items #region Basket5WestArtifact public class Basket5WestArtifact : BaseDecorationContainerArtifact { - public override int ArtifactRarity{ get{ return 2; } } + public override int ArtifactRarity => 2; [Constructible] public Basket5WestArtifact() : base( 0x24DC ) @@ -186,7 +186,7 @@ namespace Server.Items #region Basket5NorthArtifact public class Basket5NorthArtifact : BaseDecorationContainerArtifact { - public override int ArtifactRarity{ get{ return 2; } } + public override int ArtifactRarity => 2; [Constructible] public Basket5NorthArtifact() : base( 0x24DB ) @@ -216,7 +216,7 @@ namespace Server.Items #region Basket6Artifact public class Basket6Artifact : BaseDecorationContainerArtifact { - public override int ArtifactRarity{ get{ return 2; } } + public override int ArtifactRarity => 2; [Constructible] public Basket6Artifact() : base( 0x24D5 ) @@ -246,7 +246,7 @@ namespace Server.Items #region BowlArtifact public class BowlArtifact : BaseDecorationArtifact { - public override int ArtifactRarity{ get{ return 4; } } + public override int ArtifactRarity => 4; [Constructible] public BowlArtifact() : base( 0x24DE ) @@ -276,7 +276,7 @@ namespace Server.Items #region BowlsVerticalArtifact public class BowlsVerticalArtifact : BaseDecorationArtifact { - public override int ArtifactRarity{ get{ return 3; } } + public override int ArtifactRarity => 3; [Constructible] public BowlsVerticalArtifact() : base( 0x24DF ) @@ -306,7 +306,7 @@ namespace Server.Items #region BowlsHorizontalArtifact public class BowlsHorizontalArtifact : BaseDecorationArtifact { - public override int ArtifactRarity{ get{ return 4; } } + public override int ArtifactRarity => 4; [Constructible] public BowlsHorizontalArtifact() : base( 0x24E0 ) @@ -336,7 +336,7 @@ namespace Server.Items #region CupsArtifact public class CupsArtifact : BaseDecorationArtifact { - public override int ArtifactRarity{ get{ return 4; } } + public override int ArtifactRarity => 4; [Constructible] public CupsArtifact() : base( 0x24E1 ) @@ -366,7 +366,7 @@ namespace Server.Items #region FanWestArtifact public class FanWestArtifact : BaseDecorationArtifact { - public override int ArtifactRarity{ get{ return 3; } } + public override int ArtifactRarity => 3; [Constructible] public FanWestArtifact() : base( 0x240A ) @@ -396,7 +396,7 @@ namespace Server.Items #region FanNorthArtifact public class FanNorthArtifact : BaseDecorationArtifact { - public override int ArtifactRarity{ get{ return 3; } } + public override int ArtifactRarity => 3; [Constructible] public FanNorthArtifact() : base( 0x2409 ) @@ -426,7 +426,7 @@ namespace Server.Items #region TripleFanWestArtifact public class TripleFanWestArtifact : BaseDecorationArtifact { - public override int ArtifactRarity{ get{ return 4; } } + public override int ArtifactRarity => 4; [Constructible] public TripleFanWestArtifact() : base( 0x240C ) @@ -456,7 +456,7 @@ namespace Server.Items #region TripleFanNorthArtifact public class TripleFanNorthArtifact : BaseDecorationArtifact { - public override int ArtifactRarity{ get{ return 4; } } + public override int ArtifactRarity => 4; [Constructible] public TripleFanNorthArtifact() : base( 0x240B ) @@ -486,7 +486,7 @@ namespace Server.Items #region FlowersArtifact public class FlowersArtifact : BaseDecorationArtifact { - public override int ArtifactRarity{ get{ return 7; } } + public override int ArtifactRarity => 7; [Constructible] public FlowersArtifact() : base( 0x284A ) @@ -516,7 +516,7 @@ namespace Server.Items #region Painting1WestArtifact public class Painting1WestArtifact : BaseDecorationArtifact { - public override int ArtifactRarity{ get{ return 4; } } + public override int ArtifactRarity => 4; [Constructible] public Painting1WestArtifact() : base( 0x240E ) @@ -546,7 +546,7 @@ namespace Server.Items #region Painting1NorthArtifact public class Painting1NorthArtifact : BaseDecorationArtifact { - public override int ArtifactRarity{ get{ return 4; } } + public override int ArtifactRarity => 4; [Constructible] public Painting1NorthArtifact() : base( 0x240D ) @@ -576,7 +576,7 @@ namespace Server.Items #region Painting2WestArtifact public class Painting2WestArtifact : BaseDecorationArtifact { - public override int ArtifactRarity{ get{ return 4; } } + public override int ArtifactRarity => 4; [Constructible] public Painting2WestArtifact() : base( 0x2410 ) @@ -606,7 +606,7 @@ namespace Server.Items #region Painting2NorthArtifact public class Painting2NorthArtifact : BaseDecorationArtifact { - public override int ArtifactRarity{ get{ return 4; } } + public override int ArtifactRarity => 4; [Constructible] public Painting2NorthArtifact() : base( 0x240F ) @@ -636,7 +636,7 @@ namespace Server.Items #region Painting3Artifact public class Painting3Artifact : BaseDecorationArtifact { - public override int ArtifactRarity{ get{ return 5; } } + public override int ArtifactRarity => 5; [Constructible] public Painting3Artifact() : base( 0x2411 ) @@ -666,7 +666,7 @@ namespace Server.Items #region Painting4WestArtifact public class Painting4WestArtifact : BaseDecorationArtifact { - public override int ArtifactRarity{ get{ return 6; } } + public override int ArtifactRarity => 6; [Constructible] public Painting4WestArtifact() : base( 0x2412 ) @@ -696,7 +696,7 @@ namespace Server.Items #region Painting4NorthArtifact public class Painting4NorthArtifact : BaseDecorationArtifact { - public override int ArtifactRarity{ get{ return 6; } } + public override int ArtifactRarity => 6; [Constructible] public Painting4NorthArtifact() : base( 0x2411 ) @@ -726,7 +726,7 @@ namespace Server.Items #region Painting5WestArtifact public class Painting5WestArtifact : BaseDecorationArtifact { - public override int ArtifactRarity{ get{ return 8; } } + public override int ArtifactRarity => 8; [Constructible] public Painting5WestArtifact() : base( 0x2416 ) @@ -756,7 +756,7 @@ namespace Server.Items #region Painting5NorthArtifact public class Painting5NorthArtifact : BaseDecorationArtifact { - public override int ArtifactRarity{ get{ return 8; } } + public override int ArtifactRarity => 8; [Constructible] public Painting5NorthArtifact() : base( 0x2415 ) @@ -786,7 +786,7 @@ namespace Server.Items #region Painting6WestArtifact public class Painting6WestArtifact : BaseDecorationArtifact { - public override int ArtifactRarity{ get{ return 9; } } + public override int ArtifactRarity => 9; [Constructible] public Painting6WestArtifact() : base( 0x2418 ) @@ -816,7 +816,7 @@ namespace Server.Items #region Painting6NorthArtifact public class Painting6NorthArtifact : BaseDecorationArtifact { - public override int ArtifactRarity{ get{ return 9; } } + public override int ArtifactRarity => 9; [Constructible] public Painting6NorthArtifact() : base( 0x2417 ) @@ -846,7 +846,7 @@ namespace Server.Items #region SakeArtifact public class SakeArtifact : BaseDecorationArtifact { - public override int ArtifactRarity{ get{ return 4; } } + public override int ArtifactRarity => 4; [Constructible] public SakeArtifact() : base( 0x24E2 ) @@ -876,7 +876,7 @@ namespace Server.Items #region Sculpture1Artifact public class Sculpture1Artifact : BaseDecorationArtifact { - public override int ArtifactRarity{ get{ return 3; } } + public override int ArtifactRarity => 3; [Constructible] public Sculpture1Artifact() : base( 0x2419 ) @@ -906,7 +906,7 @@ namespace Server.Items #region Sculpture2Artifact public class Sculpture2Artifact : BaseDecorationArtifact { - public override int ArtifactRarity{ get{ return 3; } } + public override int ArtifactRarity => 3; [Constructible] public Sculpture2Artifact() : base( 0x241B ) @@ -936,7 +936,7 @@ namespace Server.Items #region DolphinLeftArtifact public class DolphinLeftArtifact : BaseDecorationArtifact { - public override int ArtifactRarity{ get{ return 8; } } + public override int ArtifactRarity => 8; [Constructible] public DolphinLeftArtifact() : base( 0x2846 ) @@ -966,7 +966,7 @@ namespace Server.Items #region DolphinRightArtifact public class DolphinRightArtifact : BaseDecorationArtifact { - public override int ArtifactRarity{ get{ return 8; } } + public override int ArtifactRarity => 8; [Constructible] public DolphinRightArtifact() : base( 0x2847 ) @@ -996,7 +996,7 @@ namespace Server.Items #region ManStatuetteSouthArtifact public class ManStatuetteSouthArtifact : BaseDecorationArtifact { - public override int ArtifactRarity{ get{ return 9; } } + public override int ArtifactRarity => 9; [Constructible] public ManStatuetteSouthArtifact() : base( 0x2848 ) @@ -1026,7 +1026,7 @@ namespace Server.Items #region ManStatuetteEastArtifact public class ManStatuetteEastArtifact : BaseDecorationArtifact { - public override int ArtifactRarity{ get{ return 9; } } + public override int ArtifactRarity => 9; [Constructible] public ManStatuetteEastArtifact() : base( 0x2849 ) @@ -1056,7 +1056,7 @@ namespace Server.Items #region SwordDisplay1WestArtifact public class SwordDisplay1WestArtifact : BaseDecorationArtifact { - public override int ArtifactRarity{ get{ return 5; } } + public override int ArtifactRarity => 5; [Constructible] public SwordDisplay1WestArtifact() : base( 0x2842 ) @@ -1086,7 +1086,7 @@ namespace Server.Items #region SwordDisplay1NorthArtifact public class SwordDisplay1NorthArtifact : BaseDecorationArtifact { - public override int ArtifactRarity{ get{ return 5; } } + public override int ArtifactRarity => 5; [Constructible] public SwordDisplay1NorthArtifact() : base( 0x2843 ) @@ -1116,7 +1116,7 @@ namespace Server.Items #region SwordDisplay2WestArtifact public class SwordDisplay2WestArtifact : BaseDecorationArtifact { - public override int ArtifactRarity{ get{ return 6; } } + public override int ArtifactRarity => 6; [Constructible] public SwordDisplay2WestArtifact() : base( 0x2844 ) @@ -1146,7 +1146,7 @@ namespace Server.Items #region SwordDisplay2NorthArtifact public class SwordDisplay2NorthArtifact : BaseDecorationArtifact { - public override int ArtifactRarity{ get{ return 6; } } + public override int ArtifactRarity => 6; [Constructible] public SwordDisplay2NorthArtifact() : base( 0x2845 ) @@ -1176,7 +1176,7 @@ namespace Server.Items #region SwordDisplay3SouthArtifact public class SwordDisplay3SouthArtifact : BaseDecorationArtifact { - public override int ArtifactRarity{ get{ return 8; } } + public override int ArtifactRarity => 8; [Constructible] public SwordDisplay3SouthArtifact() : base( 0x2855 ) @@ -1206,7 +1206,7 @@ namespace Server.Items #region SwordDisplay3EastArtifact public class SwordDisplay3EastArtifact : BaseDecorationArtifact { - public override int ArtifactRarity{ get{ return 8; } } + public override int ArtifactRarity => 8; [Constructible] public SwordDisplay3EastArtifact() : base( 0x2856 ) @@ -1236,7 +1236,7 @@ namespace Server.Items #region SwordDisplay4WestArtifact public class SwordDisplay4WestArtifact : BaseDecorationArtifact { - public override int ArtifactRarity{ get{ return 8; } } + public override int ArtifactRarity => 8; [Constructible] public SwordDisplay4WestArtifact() : base( 0x2853 ) @@ -1266,7 +1266,7 @@ namespace Server.Items #region SwordDisplay4NorthArtifact public class SwordDisplay4NorthArtifact : BaseDecorationArtifact { - public override int ArtifactRarity{ get{ return 9; } } + public override int ArtifactRarity => 9; [Constructible] public SwordDisplay4NorthArtifact() : base( 0x2854 ) @@ -1296,7 +1296,7 @@ namespace Server.Items #region SwordDisplay5WestArtifact public class SwordDisplay5WestArtifact : BaseDecorationArtifact { - public override int ArtifactRarity{ get{ return 9; } } + public override int ArtifactRarity => 9; [Constructible] public SwordDisplay5WestArtifact() : base( 0x2851 ) @@ -1326,7 +1326,7 @@ namespace Server.Items #region SwordDisplay5NorthArtifact public class SwordDisplay5NorthArtifact : BaseDecorationArtifact { - public override int ArtifactRarity{ get{ return 9; } } + public override int ArtifactRarity => 9; [Constructible] public SwordDisplay5NorthArtifact() : base( 0x2852 ) @@ -1356,7 +1356,7 @@ namespace Server.Items #region TeapotWestArtifact public class TeapotWestArtifact : BaseDecorationArtifact { - public override int ArtifactRarity{ get{ return 3; } } + public override int ArtifactRarity => 3; [Constructible] public TeapotWestArtifact() : base( 0x24E7 ) @@ -1386,7 +1386,7 @@ namespace Server.Items #region TeapotNorthArtifact public class TeapotNorthArtifact : BaseDecorationArtifact { - public override int ArtifactRarity{ get{ return 3; } } + public override int ArtifactRarity => 3; [Constructible] public TeapotNorthArtifact() : base( 0x24E6 ) @@ -1416,7 +1416,7 @@ namespace Server.Items #region TowerLanternArtifact public class TowerLanternArtifact : BaseDecorationArtifact { - public override int ArtifactRarity{ get{ return 3; } } + public override int ArtifactRarity => 3; [CommandProperty( AccessLevel.GameMaster )] public bool IsOn @@ -1478,7 +1478,7 @@ namespace Server.Items #region Urn1Artifact public class Urn1Artifact : BaseDecorationArtifact { - public override int ArtifactRarity{ get{ return 3; } } + public override int ArtifactRarity => 3; [Constructible] public Urn1Artifact() : base( 0x241D ) @@ -1508,7 +1508,7 @@ namespace Server.Items #region Urn2Artifact public class Urn2Artifact : BaseDecorationArtifact { - public override int ArtifactRarity{ get{ return 3; } } + public override int ArtifactRarity => 3; [Constructible] public Urn2Artifact() : base( 0x241E ) @@ -1538,7 +1538,7 @@ namespace Server.Items #region ZenRock1Artifact public class ZenRock1Artifact : BaseDecorationArtifact { - public override int ArtifactRarity{ get{ return 2; } } + public override int ArtifactRarity => 2; [Constructible] public ZenRock1Artifact() : base( 0x24E4 ) @@ -1568,7 +1568,7 @@ namespace Server.Items #region ZenRock2Artifact public class ZenRock2Artifact : BaseDecorationArtifact { - public override int ArtifactRarity{ get{ return 3; } } + public override int ArtifactRarity => 3; [Constructible] public ZenRock2Artifact() : base( 0x24E3 ) @@ -1598,7 +1598,7 @@ namespace Server.Items #region ZenRock3Artifact public class ZenRock3Artifact : BaseDecorationArtifact { - public override int ArtifactRarity{ get{ return 3; } } + public override int ArtifactRarity => 3; [Constructible] public ZenRock3Artifact() : base( 0x24E5 ) @@ -1624,4 +1624,4 @@ namespace Server.Items } } #endregion -} \ No newline at end of file +} diff --git a/Scripts/Items/Deeds/CommodityDeed.cs b/Scripts/Items/Deeds/CommodityDeed.cs index 320037f4d..964312757 100644 --- a/Scripts/Items/Deeds/CommodityDeed.cs +++ b/Scripts/Items/Deeds/CommodityDeed.cs @@ -98,7 +98,7 @@ namespace Server.Items base.OnDelete(); } - public override int LabelNumber{ get{ return m_Commodity == null ? 1047016 : 1047017; } } + public override int LabelNumber => m_Commodity == null ? 1047016 : 1047017; public override void GetProperties( ObjectPropertyList list ) { @@ -144,7 +144,7 @@ namespace Server.Items BankBox box = from.FindBankNoCreate(); CommodityDeedBox cox = CommodityDeedBox.Find( this ); - + // Veteran Rewards mods if ( m_Commodity != null ) { @@ -234,7 +234,7 @@ namespace Server.Items CommodityDeedBox cox = CommodityDeedBox.Find( m_Deed ); // Veteran Rewards mods - if ( box != null && m_Deed.IsChildOf( box ) && ((Item)targeted).IsChildOf( box ) || + if ( box != null && m_Deed.IsChildOf( box ) && ((Item)targeted).IsChildOf( box ) || cox != null && cox.IsSecure && ((Item)targeted).IsChildOf( cox ) ) { if ( m_Deed.SetCommodity( (Item) targeted ) ) @@ -268,4 +268,4 @@ namespace Server.Items } } } -} \ No newline at end of file +} diff --git a/Scripts/Items/Deeds/DragonBardingDeed.cs b/Scripts/Items/Deeds/DragonBardingDeed.cs index fa5a4112c..449e50b19 100644 --- a/Scripts/Items/Deeds/DragonBardingDeed.cs +++ b/Scripts/Items/Deeds/DragonBardingDeed.cs @@ -12,7 +12,7 @@ namespace Server.Items private Mobile m_Crafter; private CraftResource m_Resource; - public override int LabelNumber{ get{ return m_Exceptional ? 1053181 : 1053012; } } // dragon barding deed + public override int LabelNumber => m_Exceptional ? 1053181 : 1053012; // dragon barding deed [CommandProperty( AccessLevel.GameMaster )] public Mobile Crafter{ get{ return m_Crafter; } set{ m_Crafter = value; InvalidateProperties(); } } @@ -146,4 +146,4 @@ namespace Server.Items #endregion } -} \ No newline at end of file +} diff --git a/Scripts/Items/Deeds/HairRestylingDeed.cs b/Scripts/Items/Deeds/HairRestylingDeed.cs index 7e60cc6ab..883e0f573 100644 --- a/Scripts/Items/Deeds/HairRestylingDeed.cs +++ b/Scripts/Items/Deeds/HairRestylingDeed.cs @@ -10,7 +10,7 @@ namespace Server.Items { public class HairRestylingDeed : Item { - public override int LabelNumber{ get{ return 1041061; } } // a coupon for a free hair restyling + public override int LabelNumber => 1041061; // a coupon for a free hair restyling [Constructible] public HairRestylingDeed() : base( 0x14F0 ) @@ -103,8 +103,8 @@ namespace Server.Items m_Deed.Delete(); } } -/* - gump data: bgX, bgY, htmlX, htmlY, imgX, imgY, butX, butY +/* + gump data: bgX, bgY, htmlX, htmlY, imgX, imgY, butX, butY */ int[][] LayoutArray = @@ -127,8 +127,8 @@ namespace Server.Items */ int[][] HumanArray = /* why on earth cant these utilies be consistent with hex/dec */ { - new int[] { 0 }, - new int[] { 1011064, 1011064, 0, 0, 0, 0 }, // bald + new int[] { 0 }, + new int[] { 1011064, 1011064, 0, 0, 0, 0 }, // bald new int[] { 1011052, 1011052, 0x203B, 0x203B, 0xed1c, 0xC60C }, // Short new int[] { 1011053, 1011053, 0x203C, 0x203C, 0xed1d, 0xc60d }, // Long new int[] { 1011054, 1011054, 0x203D, 0x203D, 0xed1e, 0xc60e }, // Ponytail @@ -139,7 +139,7 @@ namespace Server.Items new int[] { 1011050, 1011050, 0x204A, 0x204A, 0xED29, 0xED29 }, // Topknot new int[] { 1011396, 1011396, 0x2047, 0x2047, 0xed25, 0xc618 } // Curly }; - int[][] ElvenArray = + int[][] ElvenArray = { new int[] { 0 }, new int[] { 1011064, 1011064, 0, 0, 0, 0, }, // bald @@ -154,4 +154,4 @@ namespace Server.Items }; } } -} \ No newline at end of file +} diff --git a/Scripts/Items/Deeds/HolidayTreeDeed.cs b/Scripts/Items/Deeds/HolidayTreeDeed.cs index 2cc8522bd..93575b6b1 100644 --- a/Scripts/Items/Deeds/HolidayTreeDeed.cs +++ b/Scripts/Items/Deeds/HolidayTreeDeed.cs @@ -10,7 +10,7 @@ namespace Server.Items { public class HolidayTreeDeed : Item { - public override int LabelNumber{ get{ return 1041116; } } // a deed for a holiday tree + public override int LabelNumber => 1041116; // a deed for a holiday tree [Constructible] public HolidayTreeDeed() : base( 0x14F0 ) @@ -108,7 +108,7 @@ namespace Server.Items this.Delete(); HolidayTree tree = new HolidayTree( from, type, loc ); BaseHouse house = BaseHouse.FindHouseAt( tree ); - if ( house != null ) + if ( house != null ) house.Addons.Add( tree ); } @@ -161,4 +161,4 @@ namespace Server.Items } } } -} \ No newline at end of file +} diff --git a/Scripts/Items/Deeds/NewPlayerTicket.cs b/Scripts/Items/Deeds/NewPlayerTicket.cs index d7d887765..a487f2335 100644 --- a/Scripts/Items/Deeds/NewPlayerTicket.cs +++ b/Scripts/Items/Deeds/NewPlayerTicket.cs @@ -18,7 +18,7 @@ namespace Server.Items set{ m_Owner = value; } } - public override int LabelNumber{ get{ return 1062094; } } // a young player ticket + public override int LabelNumber => 1062094; // a young player ticket [Constructible] public NewPlayerTicket() : base( 0x14EF ) diff --git a/Scripts/Items/Deeds/VendorRentalContract.cs b/Scripts/Items/Deeds/VendorRentalContract.cs index 62e191610..7ed9d0570 100644 --- a/Scripts/Items/Deeds/VendorRentalContract.cs +++ b/Scripts/Items/Deeds/VendorRentalContract.cs @@ -12,7 +12,7 @@ namespace Server.Items { public class VendorRentalContract : Item { - public override int LabelNumber{ get{ return 1062332; } } // a vendor rental contract + public override int LabelNumber => 1062332; // a vendor rental contract private VendorRentalDuration m_Duration; private int m_Price; diff --git a/Scripts/Items/Food/Beverage.cs b/Scripts/Items/Food/Beverage.cs index 07e001b3e..57f3c651a 100644 --- a/Scripts/Items/Food/Beverage.cs +++ b/Scripts/Items/Food/Beverage.cs @@ -34,8 +34,8 @@ namespace Server.Items [TypeAlias( "Server.Items.BottleAle", "Server.Items.BottleLiquor", "Server.Items.BottleWine" )] public class BeverageBottle : BaseBeverage { - public override int BaseLabelNumber { get { return 1042959; } } // a bottle of Ale - public override int MaxQuantity { get { return 5; } } + public override int BaseLabelNumber => 1042959; // a bottle of Ale + public override int MaxQuantity => 5; public override bool Fillable => false; public override int ComputeItemID() @@ -113,8 +113,8 @@ namespace Server.Items public class Jug : BaseBeverage { - public override int BaseLabelNumber { get { return 1042965; } } // a jug of Ale - public override int MaxQuantity { get { return 10; } } + public override int BaseLabelNumber => 1042965; // a jug of Ale + public override int MaxQuantity => 10; public override bool Fillable => false; public override int ComputeItemID() @@ -154,8 +154,8 @@ namespace Server.Items public class CeramicMug : BaseBeverage { - public override int BaseLabelNumber { get { return 1042982; } } // a ceramic mug of Ale - public override int MaxQuantity { get { return 1; } } + public override int BaseLabelNumber => 1042982; // a ceramic mug of Ale + public override int MaxQuantity => 1; public override int ComputeItemID() { @@ -202,8 +202,8 @@ namespace Server.Items public class PewterMug : BaseBeverage { - public override int BaseLabelNumber { get { return 1042994; } } // a pewter mug with Ale - public override int MaxQuantity { get { return 1; } } + public override int BaseLabelNumber => 1042994; // a pewter mug with Ale + public override int MaxQuantity => 1; public override int ComputeItemID() { @@ -248,8 +248,8 @@ namespace Server.Items public class Goblet : BaseBeverage { - public override int BaseLabelNumber { get { return 1043000; } } // a goblet of Ale - public override int MaxQuantity { get { return 1; } } + public override int BaseLabelNumber => 1043000; // a goblet of Ale + public override int MaxQuantity => 1; public override int ComputeItemID() { @@ -296,9 +296,9 @@ namespace Server.Items "Server.Items.GlassMilk", "Server.Items.GlassWine", "Server.Items.GlassWater" )] public class GlassMug : BaseBeverage { - public override int EmptyLabelNumber { get { return 1022456; } } // mug - public override int BaseLabelNumber { get { return 1042976; } } // a mug of Ale - public override int MaxQuantity { get { return 5; } } + public override int EmptyLabelNumber => 1022456; // mug + public override int BaseLabelNumber => 1042976; // a mug of Ale + public override int MaxQuantity => 5; public override int ComputeItemID() { @@ -399,8 +399,8 @@ namespace Server.Items "Server.Items.GlassPitcher" )] public class Pitcher : BaseBeverage { - public override int BaseLabelNumber { get { return 1048128; } } // a Pitcher of Ale - public override int MaxQuantity { get { return 5; } } + public override int BaseLabelNumber => 1048128; // a Pitcher of Ale + public override int MaxQuantity => 5; public override int ComputeItemID() { @@ -566,11 +566,11 @@ namespace Server.Items } public virtual bool ShowQuantity { get { return ( MaxQuantity > 1 ); } } - public virtual bool Fillable { get { return true; } } - public virtual bool Pourable { get { return true; } } + public virtual bool Fillable => true; + public virtual bool Pourable => true; - public virtual int EmptyLabelNumber { get { return base.LabelNumber; } } - public virtual int BaseLabelNumber { get { return 0; } } + public virtual int EmptyLabelNumber => base.LabelNumber; + public virtual int BaseLabelNumber => 0; public abstract int MaxQuantity { get; } diff --git a/Scripts/Items/Food/Chocolatiering.cs b/Scripts/Items/Food/Chocolatiering.cs index 276809c94..73e60ffb0 100644 --- a/Scripts/Items/Food/Chocolatiering.cs +++ b/Scripts/Items/Food/Chocolatiering.cs @@ -5,8 +5,8 @@ namespace Server.Items { public class CocoaLiquor : Item { - public override int LabelNumber { get { return 1080007; } } // Cocoa liquor - public override double DefaultWeight { get { return 1.0; } } + public override int LabelNumber => 1080007; // Cocoa liquor + public override double DefaultWeight => 1.0; [Constructible] public CocoaLiquor() @@ -37,8 +37,8 @@ namespace Server.Items public class SackOfSugar : Item { - public override int LabelNumber { get { return 1080003; } } // Sack of sugar - public override double DefaultWeight { get { return 1.0; } } + public override int LabelNumber => 1080003; // Sack of sugar + public override double DefaultWeight => 1.0; [Constructible] public SackOfSugar() @@ -77,8 +77,8 @@ namespace Server.Items public class CocoaButter : Item { - public override int LabelNumber { get { return 1080005; } } // Cocoa butter - public override double DefaultWeight { get { return 1.0; } } + public override int LabelNumber => 1080005; // Cocoa butter + public override double DefaultWeight => 1.0; [Constructible] public CocoaButter() @@ -109,8 +109,8 @@ namespace Server.Items public class Vanilla : Item { - public override int LabelNumber { get { return 1080009; } } // Vanilla - public override double DefaultWeight { get { return 1.0; } } + public override int LabelNumber => 1080009; // Vanilla + public override double DefaultWeight => 1.0; [Constructible] public Vanilla() @@ -149,8 +149,8 @@ namespace Server.Items public class CocoaPulp : Item { - public override int LabelNumber { get { return 1080530; } } // cocoa pulp - public override double DefaultWeight { get { return 1.0; } } + public override int LabelNumber => 1080530; // cocoa pulp + public override double DefaultWeight => 1.0; [Constructible] public CocoaPulp() @@ -189,8 +189,8 @@ namespace Server.Items public class DarkChocolate : CandyCane { - public override int LabelNumber { get { return 1079994; } } // Dark chocolate - public override double DefaultWeight { get { return 1.0; } } + public override int LabelNumber => 1079994; // Dark chocolate + public override double DefaultWeight => 1.0; [Constructible] public DarkChocolate() @@ -222,8 +222,8 @@ namespace Server.Items public class MilkChocolate : CandyCane { - public override int LabelNumber { get { return 1079995; } } // Milk chocolate - public override double DefaultWeight { get { return 1.0; } } + public override int LabelNumber => 1079995; // Milk chocolate + public override double DefaultWeight => 1.0; [Constructible] public MilkChocolate() @@ -255,8 +255,8 @@ namespace Server.Items public class WhiteChocolate : CandyCane { - public override int LabelNumber { get { return 1079996; } } // White chocolate - public override double DefaultWeight { get { return 1.0; } } + public override int LabelNumber => 1079996; // White chocolate + public override double DefaultWeight => 1.0; [Constructible] public WhiteChocolate() diff --git a/Scripts/Items/Food/CookableFood.cs b/Scripts/Items/Food/CookableFood.cs index 010120f03..421b685b4 100644 --- a/Scripts/Items/Food/CookableFood.cs +++ b/Scripts/Items/Food/CookableFood.cs @@ -136,7 +136,7 @@ namespace Server.Items private IPoint3D m_Point; private Map m_Map; private CookableFood m_CookableFood; - + public InternalTimer( Mobile from, IPoint3D p, Map map, CookableFood cookableFood ) : base( TimeSpan.FromSeconds( 5.0 ) ) { m_From = from; @@ -333,7 +333,7 @@ namespace Server.Items // ********** UnbakedPeachCobbler ********** public class UnbakedPeachCobbler : CookableFood { - public override int LabelNumber{ get{ return 1041335; } } // unbaked peach cobbler + public override int LabelNumber => 1041335; // unbaked peach cobbler [Constructible] public UnbakedPeachCobbler() : base( 0x1042, 25 ) @@ -367,7 +367,7 @@ namespace Server.Items // ********** UnbakedFruitPie ********** public class UnbakedFruitPie : CookableFood { - public override int LabelNumber{ get{ return 1041334; } } // unbaked fruit pie + public override int LabelNumber => 1041334; // unbaked fruit pie [Constructible] public UnbakedFruitPie() : base( 0x1042, 25 ) @@ -402,7 +402,7 @@ namespace Server.Items // ********** UnbakedMeatPie ********** public class UnbakedMeatPie : CookableFood { - public override int LabelNumber{ get{ return 1041338; } } // unbaked meat pie + public override int LabelNumber => 1041338; // unbaked meat pie [Constructible] public UnbakedMeatPie() : base( 0x1042, 25 ) @@ -437,7 +437,7 @@ namespace Server.Items // ********** UnbakedPumpkinPie ********** public class UnbakedPumpkinPie : CookableFood { - public override int LabelNumber{ get{ return 1041342; } } // unbaked pumpkin pie + public override int LabelNumber => 1041342; // unbaked pumpkin pie [Constructible] public UnbakedPumpkinPie() : base( 0x1042, 25 ) @@ -472,7 +472,7 @@ namespace Server.Items // ********** UnbakedApplePie ********** public class UnbakedApplePie : CookableFood { - public override int LabelNumber{ get{ return 1041336; } } // unbaked apple pie + public override int LabelNumber => 1041336; // unbaked apple pie [Constructible] public UnbakedApplePie() : base( 0x1042, 25 ) @@ -508,7 +508,7 @@ namespace Server.Items [TypeAlias( "Server.Items.UncookedPizza" )] public class UncookedCheesePizza : CookableFood { - public override int LabelNumber{ get{ return 1041341; } } // uncooked cheese pizza + public override int LabelNumber => 1041341; // uncooked cheese pizza [Constructible] public UncookedCheesePizza() : base( 0x1083, 20 ) @@ -549,7 +549,7 @@ namespace Server.Items // ********** UncookedSausagePizza ********** public class UncookedSausagePizza : CookableFood { - public override int LabelNumber{ get{ return 1041337; } } // uncooked sausage pizza + public override int LabelNumber => 1041337; // uncooked sausage pizza [Constructible] public UncookedSausagePizza() : base( 0x1083, 20 ) @@ -625,7 +625,7 @@ namespace Server.Items // ********** UnbakedQuiche ********** public class UnbakedQuiche : CookableFood { - public override int LabelNumber{ get{ return 1041339; } } // unbaked quiche + public override int LabelNumber => 1041339; // unbaked quiche [Constructible] public UnbakedQuiche() : base( 0x1042, 25 ) @@ -747,7 +747,7 @@ namespace Server.Items // ********** EasterEggs ********** public class EasterEggs : CookableFood { - public override int LabelNumber{ get{ return 1016105; } } // Easter Eggs + public override int LabelNumber => 1016105; // Easter Eggs [Constructible] public EasterEggs() : base( 0x9B5, 15 ) @@ -816,7 +816,7 @@ namespace Server.Items // ********** CakeMix ********** public class CakeMix : CookableFood { - public override int LabelNumber{ get{ return 1041002; } } // cake mix + public override int LabelNumber => 1041002; // cake mix [Constructible] public CakeMix() : base( 0x103F, 40 ) diff --git a/Scripts/Items/Food/Cooking.cs b/Scripts/Items/Food/Cooking.cs index bb8355b52..8eed513ea 100644 --- a/Scripts/Items/Food/Cooking.cs +++ b/Scripts/Items/Food/Cooking.cs @@ -115,7 +115,7 @@ namespace Server.Items // ********** SweetDough ********** public class SweetDough : Item { - public override int LabelNumber{ get{ return 1041340; } } // sweet dough + public override int LabelNumber => 1041340; // sweet dough [Constructible] public SweetDough() : base( 0x103d ) @@ -184,12 +184,12 @@ namespace Server.Items t.Start(); } } - + private class InternalTimer : Timer { private Mobile m_From; private Campfire m_Campfire; - + public InternalTimer( Mobile from, Campfire campfire ) : base( TimeSpan.FromSeconds( 5.0 ) ) { m_From = from; @@ -276,7 +276,7 @@ namespace Server.Items from.AddToBackpack( new SweetDough() ); } - + if (targeted is BowlFlour) { ((BowlFlour)targeted).Delete(); @@ -490,7 +490,7 @@ namespace Server.Items // ********** SackFlourOpen ********** public class SackFlourOpen : Item { - public override int LabelNumber{ get{ return 1024166; } } // open sack of flour + public override int LabelNumber => 1024166; // open sack of flour [Constructible] public SackFlourOpen() : base(UtilityItem.RandomChoice( 0x1046, 0x103a )) @@ -653,4 +653,4 @@ namespace Server.Items int version = reader.ReadInt(); } } -} \ No newline at end of file +} diff --git a/Scripts/Items/Food/Food.cs b/Scripts/Items/Food/Food.cs index dfe030067..68a5d50de 100644 --- a/Scripts/Items/Food/Food.cs +++ b/Scripts/Items/Food/Food.cs @@ -751,7 +751,7 @@ namespace Server.Items [TypeAlias( "Server.Items.Pizza" )] public class CheesePizza : Food { - public override int LabelNumber{ get{ return 1044516; } } // cheese pizza + public override int LabelNumber => 1044516; // cheese pizza [Constructible] public CheesePizza() : base( 0x1040 ) @@ -782,7 +782,7 @@ namespace Server.Items public class SausagePizza : Food { - public override int LabelNumber{ get{ return 1044517; } } // sausage pizza + public override int LabelNumber => 1044517; // sausage pizza [Constructible] public SausagePizza() : base( 0x1040 ) @@ -844,7 +844,7 @@ namespace Server.Items public class FruitPie : Food { - public override int LabelNumber{ get{ return 1041346; } } // baked fruit pie + public override int LabelNumber => 1041346; // baked fruit pie [Constructible] public FruitPie() : base( 0x1041 ) @@ -875,7 +875,7 @@ namespace Server.Items public class MeatPie : Food { - public override int LabelNumber{ get{ return 1041347; } } // baked meat pie + public override int LabelNumber => 1041347; // baked meat pie [Constructible] public MeatPie() : base( 0x1041 ) @@ -906,7 +906,7 @@ namespace Server.Items public class PumpkinPie : Food { - public override int LabelNumber{ get{ return 1041348; } } // baked pumpkin pie + public override int LabelNumber => 1041348; // baked pumpkin pie [Constructible] public PumpkinPie() : base( 0x1041 ) @@ -937,7 +937,7 @@ namespace Server.Items public class ApplePie : Food { - public override int LabelNumber{ get{ return 1041343; } } // baked apple pie + public override int LabelNumber => 1041343; // baked apple pie [Constructible] public ApplePie() : base( 0x1041 ) @@ -968,7 +968,7 @@ namespace Server.Items public class PeachCobbler : Food { - public override int LabelNumber{ get{ return 1041344; } } // baked peach cobbler + public override int LabelNumber => 1041344; // baked peach cobbler [Constructible] public PeachCobbler() : base( 0x1041 ) @@ -999,7 +999,7 @@ namespace Server.Items public class Quiche : Food { - public override int LabelNumber{ get{ return 1041345; } } // baked quiche + public override int LabelNumber => 1041345; // baked quiche [Constructible] public Quiche() : base( 0x1041 ) @@ -1289,4 +1289,4 @@ namespace Server.Items int version = reader.ReadInt(); } } -} \ No newline at end of file +} diff --git a/Scripts/Items/Games/BaseBoard.cs b/Scripts/Items/Games/BaseBoard.cs index 9ec0c39d9..dd821815d 100644 --- a/Scripts/Items/Games/BaseBoard.cs +++ b/Scripts/Items/Games/BaseBoard.cs @@ -75,7 +75,7 @@ namespace Server.Items Weight = 5.0; } - public override TimeSpan DecayTime{ get{ return TimeSpan.FromDays( 1.0 ); } } + public override TimeSpan DecayTime => TimeSpan.FromDays( 1.0 ); public override bool OnDragDrop( Mobile from, Item dropped ) { diff --git a/Scripts/Items/Games/CheckerBoard.cs b/Scripts/Items/Games/CheckerBoard.cs index 5f29aea97..5d50167ea 100644 --- a/Scripts/Items/Games/CheckerBoard.cs +++ b/Scripts/Items/Games/CheckerBoard.cs @@ -5,7 +5,7 @@ namespace Server.Items { public class CheckerBoard : BaseBoard { - public override int LabelNumber{ get{ return 1016449; } } // a checker board + public override int LabelNumber => 1016449; // a checker board [Constructible] public CheckerBoard() : base( 0xFA6 ) @@ -41,4 +41,4 @@ namespace Server.Items int version = reader.ReadInt(); } } -} \ No newline at end of file +} diff --git a/Scripts/Items/Games/Chessboard.cs b/Scripts/Items/Games/Chessboard.cs index 194b9d782..5d727ca26 100644 --- a/Scripts/Items/Games/Chessboard.cs +++ b/Scripts/Items/Games/Chessboard.cs @@ -5,7 +5,7 @@ namespace Server.Items { public class Chessboard : BaseBoard { - public override int LabelNumber{ get{ return 1016450; } } // a chessboard + public override int LabelNumber => 1016450; // a chessboard [Constructible] public Chessboard() : base( 0xFA6 ) @@ -33,14 +33,14 @@ namespace Server.Items CreatePiece( new PieceWhiteKnight( this ), 216, 30 ); CreatePiece( new PieceWhiteKnight( this ), 216, 155 ); - + // Bishop CreatePiece( new PieceBlackBishop( this ), 42, 55 ); CreatePiece( new PieceBlackBishop( this ), 42, 130 ); CreatePiece( new PieceWhiteBishop( this ), 216, 55 ); CreatePiece( new PieceWhiteBishop( this ), 216, 130 ); - + // Queen CreatePiece( new PieceBlackQueen( this ), 42, 105 ); CreatePiece( new PieceWhiteQueen( this ), 216, 105 ); @@ -66,4 +66,4 @@ namespace Server.Items int version = reader.ReadInt(); } } -} \ No newline at end of file +} diff --git a/Scripts/Items/Games/Mahjong/MahjongDealerIndicator.cs b/Scripts/Items/Games/Mahjong/MahjongDealerIndicator.cs index f3351cfeb..7b81302ba 100644 --- a/Scripts/Items/Games/Mahjong/MahjongDealerIndicator.cs +++ b/Scripts/Items/Games/Mahjong/MahjongDealerIndicator.cs @@ -18,10 +18,10 @@ namespace Server.Engines.Mahjong private MahjongPieceDirection m_Direction; private MahjongWind m_Wind; - public MahjongGame Game { get { return m_Game; } } - public Point2D Position { get { return m_Position; } } - public MahjongPieceDirection Direction { get { return m_Direction; } } - public MahjongWind Wind { get { return m_Wind; } } + public MahjongGame Game => m_Game; + public Point2D Position => m_Position; + public MahjongPieceDirection Direction => m_Direction; + public MahjongWind Wind => m_Wind; public MahjongDealerIndicator( MahjongGame game, Point2D position, MahjongPieceDirection direction, MahjongWind wind ) { @@ -70,4 +70,4 @@ namespace Server.Engines.Mahjong m_Wind = (MahjongWind) reader.ReadInt(); } } -} \ No newline at end of file +} diff --git a/Scripts/Items/Games/Mahjong/MahjongDices.cs b/Scripts/Items/Games/Mahjong/MahjongDices.cs index 7f203e89e..a53eeda3d 100644 --- a/Scripts/Items/Games/Mahjong/MahjongDices.cs +++ b/Scripts/Items/Games/Mahjong/MahjongDices.cs @@ -9,9 +9,9 @@ namespace Server.Engines.Mahjong private int m_First; private int m_Second; - public MahjongGame Game { get { return m_Game; } } - public int First { get { return m_First; } } - public int Second { get { return m_Second; } } + public MahjongGame Game => m_Game; + public int First => m_First; + public int Second => m_Second; public MahjongDices( MahjongGame game ) { @@ -49,4 +49,4 @@ namespace Server.Engines.Mahjong m_Second = reader.ReadInt(); } } -} \ No newline at end of file +} diff --git a/Scripts/Items/Games/Mahjong/MahjongGame.cs b/Scripts/Items/Games/Mahjong/MahjongGame.cs index 5ad09faad..0acaf1632 100644 --- a/Scripts/Items/Games/Mahjong/MahjongGame.cs +++ b/Scripts/Items/Games/Mahjong/MahjongGame.cs @@ -22,11 +22,11 @@ namespace Server.Engines.Mahjong private bool m_SpectatorVision; private DateTime m_LastReset; - public MahjongTile[] Tiles { get { return m_Tiles; } } - public MahjongDealerIndicator DealerIndicator { get { return m_DealerIndicator; } } - public MahjongWallBreakIndicator WallBreakIndicator { get { return m_WallBreakIndicator; } } - public MahjongDices Dices { get { return m_Dices; } } - public MahjongPlayers Players { get { return m_Players; } } + public MahjongTile[] Tiles => m_Tiles; + public MahjongDealerIndicator DealerIndicator => m_DealerIndicator; + public MahjongWallBreakIndicator WallBreakIndicator => m_WallBreakIndicator; + public MahjongDices Dices => m_Dices; + public MahjongPlayers Players => m_Players; private SecureLevel m_Level; @@ -299,4 +299,4 @@ namespace Server.Engines.Mahjong } } } -} \ No newline at end of file +} diff --git a/Scripts/Items/Games/Mahjong/MahjongPieceDim.cs b/Scripts/Items/Games/Mahjong/MahjongPieceDim.cs index 712be61f8..c1fde32d2 100644 --- a/Scripts/Items/Games/Mahjong/MahjongPieceDim.cs +++ b/Scripts/Items/Games/Mahjong/MahjongPieceDim.cs @@ -9,9 +9,9 @@ namespace Server.Engines.Mahjong private int m_Width; private int m_Height; - public Point2D Position { get { return m_Position; } } - public int Width { get { return m_Width; } } - public int Height { get { return m_Height; } } + public Point2D Position => m_Position; + public int Width => m_Width; + public int Height => m_Height; public MahjongPieceDim( Point2D position, int width, int height ) { @@ -47,4 +47,4 @@ namespace Server.Engines.Mahjong return -1; } } -} \ No newline at end of file +} diff --git a/Scripts/Items/Games/Mahjong/MahjongPlayers.cs b/Scripts/Items/Games/Mahjong/MahjongPlayers.cs index a904fbf5a..5fc778e2b 100644 --- a/Scripts/Items/Games/Mahjong/MahjongPlayers.cs +++ b/Scripts/Items/Games/Mahjong/MahjongPlayers.cs @@ -14,10 +14,10 @@ namespace Server.Engines.Mahjong private int m_DealerPosition; private ArrayList m_Spectators; - public MahjongGame Game { get { return m_Game; } } - public int Seats { get { return m_Players.Length; } } - public Mobile Dealer { get { return m_Players[m_DealerPosition]; } } - public int DealerPosition { get { return m_DealerPosition; } } + public MahjongGame Game => m_Game; + public int Seats => m_Players.Length; + public Mobile Dealer => m_Players[m_DealerPosition]; + public int DealerPosition => m_DealerPosition; public MahjongPlayers( MahjongGame game, int maxPlayers, int baseScore ) { @@ -549,4 +549,4 @@ namespace Server.Engines.Mahjong m_DealerPosition = reader.ReadInt(); } } -} \ No newline at end of file +} diff --git a/Scripts/Items/Games/Mahjong/MahjongTile.cs b/Scripts/Items/Games/Mahjong/MahjongTile.cs index 7006dff1f..a719fe355 100644 --- a/Scripts/Items/Games/Mahjong/MahjongTile.cs +++ b/Scripts/Items/Games/Mahjong/MahjongTile.cs @@ -21,13 +21,13 @@ namespace Server.Engines.Mahjong private MahjongPieceDirection m_Direction; private bool m_Flipped; - public MahjongGame Game { get { return m_Game; } } - public int Number { get { return m_Number; } } - public MahjongTileType Value { get { return m_Value; } } - public Point2D Position { get { return m_Position; } } - public int StackLevel { get { return m_StackLevel; } } - public MahjongPieceDirection Direction { get { return m_Direction; } } - public bool Flipped { get { return m_Flipped; } } + public MahjongGame Game => m_Game; + public int Number => m_Number; + public MahjongTileType Value => m_Value; + public Point2D Position => m_Position; + public int StackLevel => m_StackLevel; + public MahjongPieceDirection Direction => m_Direction; + public bool Flipped => m_Flipped; public MahjongTile( MahjongGame game, int number, MahjongTileType value, Point2D position, int stackLevel, MahjongPieceDirection direction, bool flipped ) { @@ -94,4 +94,4 @@ namespace Server.Engines.Mahjong m_Flipped = reader.ReadBool(); } } -} \ No newline at end of file +} diff --git a/Scripts/Items/Games/Mahjong/MahjongTileTypeGenerator.cs b/Scripts/Items/Games/Mahjong/MahjongTileTypeGenerator.cs index 4ab4262c0..2fd94e8bd 100644 --- a/Scripts/Items/Games/Mahjong/MahjongTileTypeGenerator.cs +++ b/Scripts/Items/Games/Mahjong/MahjongTileTypeGenerator.cs @@ -8,7 +8,7 @@ namespace Server.Engines.Mahjong { private ArrayList m_LeftTileTypes; - public ArrayList LeftTileTypes { get { return m_LeftTileTypes; } } + public ArrayList LeftTileTypes => m_LeftTileTypes; public MahjongTileTypeGenerator( int count ) { @@ -32,4 +32,4 @@ namespace Server.Engines.Mahjong return next; } } -} \ No newline at end of file +} diff --git a/Scripts/Items/Games/Mahjong/MahjongWallBreakIndicator.cs b/Scripts/Items/Games/Mahjong/MahjongWallBreakIndicator.cs index d3fbbbe0d..994d603af 100644 --- a/Scripts/Items/Games/Mahjong/MahjongWallBreakIndicator.cs +++ b/Scripts/Items/Games/Mahjong/MahjongWallBreakIndicator.cs @@ -13,8 +13,8 @@ namespace Server.Engines.Mahjong private MahjongGame m_Game; private Point2D m_Position; - public MahjongGame Game { get { return m_Game; } } - public Point2D Position { get { return m_Position; } } + public MahjongGame Game => m_Game; + public Point2D Position => m_Position; public MahjongWallBreakIndicator( MahjongGame game, Point2D position ) { @@ -55,4 +55,4 @@ namespace Server.Engines.Mahjong m_Position = reader.ReadPoint2D(); } } -} \ No newline at end of file +} diff --git a/Scripts/Items/Guilds/GuildDeed.cs b/Scripts/Items/Guilds/GuildDeed.cs index 88c6a3de1..74bda5c54 100644 --- a/Scripts/Items/Guilds/GuildDeed.cs +++ b/Scripts/Items/Guilds/GuildDeed.cs @@ -9,7 +9,7 @@ namespace Server.Items { public class GuildDeed : Item { - public override int LabelNumber{ get{ return 1041055; } } // a guild deed + public override int LabelNumber => 1041055; // a guild deed [Constructible] public GuildDeed() : base( 0x14F0 ) diff --git a/Scripts/Items/Guilds/GuildTeleporter.cs b/Scripts/Items/Guilds/GuildTeleporter.cs index 6f558f81f..fe98f377a 100644 --- a/Scripts/Items/Guilds/GuildTeleporter.cs +++ b/Scripts/Items/Guilds/GuildTeleporter.cs @@ -11,7 +11,7 @@ namespace Server.Items { private Item m_Stone; - public override int LabelNumber{ get{ return 1041054; } } // guildstone teleporter + public override int LabelNumber => 1041054; // guildstone teleporter [Constructible] public GuildTeleporter() : this( null ) diff --git a/Scripts/Items/Guilds/Guildstone.cs b/Scripts/Items/Guilds/Guildstone.cs index 6f66e76fe..efaa2314d 100644 --- a/Scripts/Items/Guilds/Guildstone.cs +++ b/Scripts/Items/Guilds/Guildstone.cs @@ -37,7 +37,7 @@ namespace Server.Items } } - public override int LabelNumber { get { return 1041429; } } // a guildstone + public override int LabelNumber => 1041429; // a guildstone public Guildstone( Guild g ) : this( g, g.Name, g.Abbreviation ) { @@ -275,7 +275,7 @@ namespace Server.Items [Flippable( 0x14F0, 0x14EF )] public class GuildstoneDeed : Item { - public override int LabelNumber { get { return 1041233; } } // deed to a guildstone + public override int LabelNumber => 1041233; // deed to a guildstone private Guild m_Guild; private string m_GuildName; diff --git a/Scripts/Items/Jewels/Artifacts/BraceletOfHealth.cs b/Scripts/Items/Jewels/Artifacts/BraceletOfHealth.cs index 90da7ce13..0656f4d20 100644 --- a/Scripts/Items/Jewels/Artifacts/BraceletOfHealth.cs +++ b/Scripts/Items/Jewels/Artifacts/BraceletOfHealth.cs @@ -5,8 +5,8 @@ namespace Server.Items { public class BraceletOfHealth : GoldBracelet { - public override int LabelNumber{ get{ return 1061103; } } // Bracelet of Health - public override int ArtifactRarity{ get{ return 11; } } + public override int LabelNumber => 1061103; // Bracelet of Health + public override int ArtifactRarity => 11; [Constructible] public BraceletOfHealth() @@ -26,7 +26,7 @@ namespace Server.Items writer.Write( (int) 0 ); } - + public override void Deserialize(GenericReader reader) { base.Deserialize( reader ); @@ -34,4 +34,4 @@ namespace Server.Items int version = reader.ReadInt(); } } -} \ No newline at end of file +} diff --git a/Scripts/Items/Jewels/Artifacts/Craftable/EssenceOfBattle.cs b/Scripts/Items/Jewels/Artifacts/Craftable/EssenceOfBattle.cs index e9064d3f3..3c8367b2d 100644 --- a/Scripts/Items/Jewels/Artifacts/Craftable/EssenceOfBattle.cs +++ b/Scripts/Items/Jewels/Artifacts/Craftable/EssenceOfBattle.cs @@ -4,7 +4,7 @@ namespace Server.Items { public class EssenceOfBattle : GoldRing { - public override int LabelNumber{ get{ return 1072935; } } // Essence of Battle + public override int LabelNumber => 1072935; // Essence of Battle [Constructible] public EssenceOfBattle() diff --git a/Scripts/Items/Jewels/Artifacts/Craftable/PendantOfTheMagi.cs b/Scripts/Items/Jewels/Artifacts/Craftable/PendantOfTheMagi.cs index d2bbc3f1e..625aec0cb 100644 --- a/Scripts/Items/Jewels/Artifacts/Craftable/PendantOfTheMagi.cs +++ b/Scripts/Items/Jewels/Artifacts/Craftable/PendantOfTheMagi.cs @@ -4,7 +4,7 @@ namespace Server.Items { public class PendantOfTheMagi : GoldNecklace { - public override int LabelNumber{ get{ return 1072937; } } // Pendant of the Magi + public override int LabelNumber => 1072937; // Pendant of the Magi [Constructible] public PendantOfTheMagi() diff --git a/Scripts/Items/Jewels/Artifacts/Craftable/ResillientBracer.cs b/Scripts/Items/Jewels/Artifacts/Craftable/ResillientBracer.cs index b9dcb0b51..f61269273 100644 --- a/Scripts/Items/Jewels/Artifacts/Craftable/ResillientBracer.cs +++ b/Scripts/Items/Jewels/Artifacts/Craftable/ResillientBracer.cs @@ -4,9 +4,9 @@ namespace Server.Items { public class ResilientBracer : GoldBracelet { - public override int LabelNumber{ get{ return 1072933; } } // Resillient Bracer + public override int LabelNumber => 1072933; // Resillient Bracer - public override int PhysicalResistance{ get { return 20; } } + public override int PhysicalResistance => 20; [Constructible] public ResilientBracer() diff --git a/Scripts/Items/Jewels/Artifacts/OrnamentOfTheMagician.cs b/Scripts/Items/Jewels/Artifacts/OrnamentOfTheMagician.cs index 093e2ec64..ee2844542 100644 --- a/Scripts/Items/Jewels/Artifacts/OrnamentOfTheMagician.cs +++ b/Scripts/Items/Jewels/Artifacts/OrnamentOfTheMagician.cs @@ -5,8 +5,8 @@ namespace Server.Items { public class OrnamentOfTheMagician : GoldBracelet { - public override int LabelNumber{ get{ return 1061105; } } // Ornament of the Magician - public override int ArtifactRarity{ get{ return 11; } } + public override int LabelNumber => 1061105; // Ornament of the Magician + public override int ArtifactRarity => 11; [Constructible] public OrnamentOfTheMagician() @@ -29,7 +29,7 @@ namespace Server.Items writer.Write( (int) 0 ); } - + public override void Deserialize(GenericReader reader) { base.Deserialize( reader ); @@ -40,4 +40,4 @@ namespace Server.Items Hue = 0x554; } } -} \ No newline at end of file +} diff --git a/Scripts/Items/Jewels/Artifacts/RingOfTheElements.cs b/Scripts/Items/Jewels/Artifacts/RingOfTheElements.cs index c51578e46..5bbf197fb 100644 --- a/Scripts/Items/Jewels/Artifacts/RingOfTheElements.cs +++ b/Scripts/Items/Jewels/Artifacts/RingOfTheElements.cs @@ -5,8 +5,8 @@ namespace Server.Items { public class RingOfTheElements : GoldRing { - public override int LabelNumber{ get{ return 1061104; } } // Ring of the Elements - public override int ArtifactRarity{ get{ return 11; } } + public override int LabelNumber => 1061104; // Ring of the Elements + public override int ArtifactRarity => 11; [Constructible] public RingOfTheElements() @@ -29,7 +29,7 @@ namespace Server.Items writer.Write( (int) 0 ); } - + public override void Deserialize(GenericReader reader) { base.Deserialize( reader ); @@ -37,4 +37,4 @@ namespace Server.Items int version = reader.ReadInt(); } } -} \ No newline at end of file +} diff --git a/Scripts/Items/Jewels/Artifacts/RingOfTheVile.cs b/Scripts/Items/Jewels/Artifacts/RingOfTheVile.cs index 70df08480..33aca1585 100644 --- a/Scripts/Items/Jewels/Artifacts/RingOfTheVile.cs +++ b/Scripts/Items/Jewels/Artifacts/RingOfTheVile.cs @@ -5,8 +5,8 @@ namespace Server.Items { public class RingOfTheVile : GoldRing { - public override int LabelNumber{ get{ return 1061102; } } // Ring of the Vile - public override int ArtifactRarity{ get{ return 11; } } + public override int LabelNumber => 1061102; // Ring of the Vile + public override int ArtifactRarity => 11; [Constructible] public RingOfTheVile() @@ -28,7 +28,7 @@ namespace Server.Items writer.Write( (int) 0 ); } - + public override void Deserialize(GenericReader reader) { base.Deserialize( reader ); @@ -39,4 +39,4 @@ namespace Server.Items Hue = 0x4F7; } } -} \ No newline at end of file +} diff --git a/Scripts/Items/Jewels/BaseJewel.cs b/Scripts/Items/Jewels/BaseJewel.cs index 0d67bdf14..f8cd745fc 100644 --- a/Scripts/Items/Jewels/BaseJewel.cs +++ b/Scripts/Items/Jewels/BaseJewel.cs @@ -38,11 +38,11 @@ namespace Server.Items [CommandProperty( AccessLevel.GameMaster )] public int HitPoints { - get + get { return m_HitPoints; } - set + set { if ( value != m_HitPoints && MaxHitPoints > 0 ) { @@ -93,11 +93,11 @@ namespace Server.Items set{ m_GemType = value; InvalidateProperties(); } } - public override int PhysicalResistance{ get{ return m_AosResistances.Physical; } } - public override int FireResistance{ get{ return m_AosResistances.Fire; } } - public override int ColdResistance{ get{ return m_AosResistances.Cold; } } - public override int PoisonResistance{ get{ return m_AosResistances.Poison; } } - public override int EnergyResistance{ get{ return m_AosResistances.Energy; } } + public override int PhysicalResistance => m_AosResistances.Physical; + public override int FireResistance => m_AosResistances.Fire; + public override int ColdResistance => m_AosResistances.Cold; + public override int PoisonResistance => m_AosResistances.Poison; + public override int EnergyResistance => m_AosResistances.Energy; public virtual int BaseGemTypeNumber{ get{ return 0; } } public virtual int InitMinHits{ get{ return 0; } } @@ -416,4 +416,4 @@ namespace Server.Items #endregion } -} \ No newline at end of file +} diff --git a/Scripts/Items/Jewels/Bracelet.cs b/Scripts/Items/Jewels/Bracelet.cs index fbd70c7c6..d19df068d 100644 --- a/Scripts/Items/Jewels/Bracelet.cs +++ b/Scripts/Items/Jewels/Bracelet.cs @@ -4,7 +4,7 @@ namespace Server.Items { public abstract class BaseBracelet : BaseJewel { - public override int BaseGemTypeNumber{ get{ return 1044221; } } // star sapphire bracelet + public override int BaseGemTypeNumber => 1044221; // star sapphire bracelet public BaseBracelet( int itemID ) : base( itemID, Layer.Bracelet ) { diff --git a/Scripts/Items/Jewels/Earrings.cs b/Scripts/Items/Jewels/Earrings.cs index ba6028f73..139a6cae4 100644 --- a/Scripts/Items/Jewels/Earrings.cs +++ b/Scripts/Items/Jewels/Earrings.cs @@ -4,7 +4,7 @@ namespace Server.Items { public abstract class BaseEarrings : BaseJewel { - public override int BaseGemTypeNumber{ get{ return 1044203; } } // star sapphire earrings + public override int BaseGemTypeNumber => 1044203; // star sapphire earrings public BaseEarrings( int itemID ) : base( itemID, Layer.Earrings ) { @@ -82,4 +82,4 @@ namespace Server.Items int version = reader.ReadInt(); } } -} \ No newline at end of file +} diff --git a/Scripts/Items/Jewels/Necklace.cs b/Scripts/Items/Jewels/Necklace.cs index 6ff9c8d59..3d82a1929 100644 --- a/Scripts/Items/Jewels/Necklace.cs +++ b/Scripts/Items/Jewels/Necklace.cs @@ -4,7 +4,7 @@ namespace Server.Items { public abstract class BaseNecklace : BaseJewel { - public override int BaseGemTypeNumber{ get{ return 1044241; } } // star sapphire necklace + public override int BaseGemTypeNumber => 1044241; // star sapphire necklace public BaseNecklace( int itemID ) : base( itemID, Layer.Neck ) { @@ -164,4 +164,4 @@ namespace Server.Items int version = reader.ReadInt(); } } -} \ No newline at end of file +} diff --git a/Scripts/Items/Jewels/Ring.cs b/Scripts/Items/Jewels/Ring.cs index 20ba3166e..92e4826f7 100644 --- a/Scripts/Items/Jewels/Ring.cs +++ b/Scripts/Items/Jewels/Ring.cs @@ -4,7 +4,7 @@ namespace Server.Items { public abstract class BaseRing : BaseJewel { - public override int BaseGemTypeNumber{ get{ return 1044176; } } // star sapphire ring + public override int BaseGemTypeNumber => 1044176; // star sapphire ring public BaseRing( int itemID ) : base( itemID, Layer.Ring ) { diff --git a/Scripts/Items/Lights/BaseLight.cs b/Scripts/Items/Lights/BaseLight.cs index 6c5262cc5..65058580f 100644 --- a/Scripts/Items/Lights/BaseLight.cs +++ b/Scripts/Items/Lights/BaseLight.cs @@ -13,13 +13,13 @@ namespace Server.Items private TimeSpan m_Duration = TimeSpan.Zero; public abstract int LitItemID{ get; } - - public virtual int UnlitItemID{ get { return 0; } } - public virtual int BurntOutItemID{ get { return 0; } } - - public virtual int LitSound{ get { return 0x47; } } - public virtual int UnlitSound{ get { return 0x3be; } } - public virtual int BurntOutSound{ get { return 0x4b8; } } + + public virtual int UnlitItemID => 0; + public virtual int BurntOutItemID => 0; + + public virtual int LitSound => 0x47; + public virtual int UnlitSound => 0x3be; + public virtual int BurntOutSound => 0x4b8; public static readonly bool Burnout = false; @@ -82,9 +82,9 @@ namespace Server.Items { Point3D loc = GetWorldLocation(); Effects.PlaySound( loc, Map, LitSound ); - } + } } - + public virtual void PlayUnlitSound() { int sound = UnlitSound; @@ -92,12 +92,12 @@ namespace Server.Items if ( m_BurntOut && BurntOutSound != 0 ) sound = BurntOutSound; - + if ( sound != 0 ) { Point3D loc = GetWorldLocation(); Effects.PlaySound( loc, Map, sound ); - } + } } public virtual void Ignite() @@ -115,7 +115,7 @@ namespace Server.Items public virtual void Douse() { m_Burning = false; - + if ( m_BurntOut && BurntOutItemID != 0 ) ItemID = BurntOutItemID; else @@ -141,7 +141,7 @@ namespace Server.Items private void DoTimer( TimeSpan delay ) { m_Duration = delay; - + if ( m_Timer != null ) m_Timer.Stop(); diff --git a/Scripts/Items/Lights/Brazier.cs b/Scripts/Items/Lights/Brazier.cs index 5bbd544ab..b5a2c6bb9 100644 --- a/Scripts/Items/Lights/Brazier.cs +++ b/Scripts/Items/Lights/Brazier.cs @@ -5,8 +5,8 @@ namespace Server.Items { public class Brazier : BaseLight { - public override int LitItemID{ get { return 0xE31; } } - + public override int LitItemID => 0xE31; + [Constructible] public Brazier() : base( 0xE31 ) { @@ -33,4 +33,4 @@ namespace Server.Items int version = reader.ReadInt(); } } -} \ No newline at end of file +} diff --git a/Scripts/Items/Lights/BrazierTall.cs b/Scripts/Items/Lights/BrazierTall.cs index 9f98addb5..2ff4b64f9 100644 --- a/Scripts/Items/Lights/BrazierTall.cs +++ b/Scripts/Items/Lights/BrazierTall.cs @@ -5,8 +5,8 @@ namespace Server.Items { public class BrazierTall : BaseLight { - public override int LitItemID{ get { return 0x19AA; } } - + public override int LitItemID => 0x19AA; + [Constructible] public BrazierTall() : base( 0x19AA ) { @@ -33,4 +33,4 @@ namespace Server.Items int version = reader.ReadInt(); } } -} \ No newline at end of file +} diff --git a/Scripts/Items/Lights/Candelabra.cs b/Scripts/Items/Lights/Candelabra.cs index ed5a4c951..8e6cbb807 100644 --- a/Scripts/Items/Lights/Candelabra.cs +++ b/Scripts/Items/Lights/Candelabra.cs @@ -5,8 +5,8 @@ namespace Server.Items { public class Candelabra : BaseLight, IShipwreckedItem { - public override int LitItemID{ get { return 0xB1D; } } - public override int UnlitItemID{ get { return 0xA27; } } + public override int LitItemID => 0xB1D; + public override int UnlitItemID => 0xA27; [Constructible] public Candelabra() : base( 0xA27 ) @@ -72,4 +72,4 @@ namespace Server.Items } #endregion } -} \ No newline at end of file +} diff --git a/Scripts/Items/Lights/CandelabraStand.cs b/Scripts/Items/Lights/CandelabraStand.cs index 38a61c3b6..061f7ca1a 100644 --- a/Scripts/Items/Lights/CandelabraStand.cs +++ b/Scripts/Items/Lights/CandelabraStand.cs @@ -5,8 +5,8 @@ namespace Server.Items { public class CandelabraStand : BaseLight { - public override int LitItemID{ get { return 0xB26; } } - public override int UnlitItemID{ get { return 0xA29; } } + public override int LitItemID => 0xB26; + public override int UnlitItemID => 0xA29; [Constructible] public CandelabraStand() : base( 0xA29 ) @@ -33,4 +33,4 @@ namespace Server.Items int version = reader.ReadInt(); } } -} \ No newline at end of file +} diff --git a/Scripts/Items/Lights/Candle.cs b/Scripts/Items/Lights/Candle.cs index be6c773fa..7b0f3c1c7 100644 --- a/Scripts/Items/Lights/Candle.cs +++ b/Scripts/Items/Lights/Candle.cs @@ -5,8 +5,8 @@ namespace Server.Items { public class Candle : BaseEquipableLight { - public override int LitItemID{ get { return 0xA0F; } } - public override int UnlitItemID{ get { return 0xA28; } } + public override int LitItemID => 0xA0F; + public override int UnlitItemID => 0xA28; [Constructible] public Candle() : base( 0xA28 ) @@ -37,4 +37,4 @@ namespace Server.Items int version = reader.ReadInt(); } } -} \ No newline at end of file +} diff --git a/Scripts/Items/Lights/CandleLarge.cs b/Scripts/Items/Lights/CandleLarge.cs index abfdc59a0..c767ecb8c 100644 --- a/Scripts/Items/Lights/CandleLarge.cs +++ b/Scripts/Items/Lights/CandleLarge.cs @@ -5,8 +5,8 @@ namespace Server.Items { public class CandleLarge : BaseLight { - public override int LitItemID{ get { return 0xB1A; } } - public override int UnlitItemID{ get { return 0xA26; } } + public override int LitItemID => 0xB1A; + public override int UnlitItemID => 0xA26; [Constructible] public CandleLarge() : base( 0xA26 ) @@ -37,4 +37,4 @@ namespace Server.Items int version = reader.ReadInt(); } } -} \ No newline at end of file +} diff --git a/Scripts/Items/Lights/CandleLong.cs b/Scripts/Items/Lights/CandleLong.cs index 0d4c0ad04..ed36468fb 100644 --- a/Scripts/Items/Lights/CandleLong.cs +++ b/Scripts/Items/Lights/CandleLong.cs @@ -5,8 +5,8 @@ namespace Server.Items { public class CandleLong : BaseLight { - public override int LitItemID{ get { return 0x1430; } } - public override int UnlitItemID{ get { return 0x1433; } } + public override int LitItemID => 0x1430; + public override int UnlitItemID => 0x1433; [Constructible] public CandleLong() : base( 0x1433 ) @@ -37,4 +37,4 @@ namespace Server.Items int version = reader.ReadInt(); } } -} \ No newline at end of file +} diff --git a/Scripts/Items/Lights/CandleShort.cs b/Scripts/Items/Lights/CandleShort.cs index a9f386d2d..39efdb7ae 100644 --- a/Scripts/Items/Lights/CandleShort.cs +++ b/Scripts/Items/Lights/CandleShort.cs @@ -5,8 +5,8 @@ namespace Server.Items { public class CandleShort : BaseLight { - public override int LitItemID{ get { return 0x142C; } } - public override int UnlitItemID{ get { return 0x142F; } } + public override int LitItemID => 0x142C; + public override int UnlitItemID => 0x142F; [Constructible] public CandleShort() : base( 0x142F ) @@ -37,4 +37,4 @@ namespace Server.Items int version = reader.ReadInt(); } } -} \ No newline at end of file +} diff --git a/Scripts/Items/Lights/HangingLantern.cs b/Scripts/Items/Lights/HangingLantern.cs index 16e6a449e..d59db4ada 100644 --- a/Scripts/Items/Lights/HangingLantern.cs +++ b/Scripts/Items/Lights/HangingLantern.cs @@ -5,9 +5,9 @@ namespace Server.Items { public class HangingLantern : BaseLight { - public override int LitItemID{ get { return 0xA1A; } } - public override int UnlitItemID{ get { return 0xA1D; } } - + public override int LitItemID => 0xA1A; + public override int UnlitItemID => 0xA1D; + [Constructible] public HangingLantern() : base( 0xA1D ) { @@ -34,4 +34,4 @@ namespace Server.Items int version = reader.ReadInt(); } } -} \ No newline at end of file +} diff --git a/Scripts/Items/Lights/HeatingStand.cs b/Scripts/Items/Lights/HeatingStand.cs index b6c7211e6..60d8e99c1 100644 --- a/Scripts/Items/Lights/HeatingStand.cs +++ b/Scripts/Items/Lights/HeatingStand.cs @@ -5,8 +5,8 @@ namespace Server.Items { public class HeatingStand : BaseLight { - public override int LitItemID{ get { return 0x184A; } } - public override int UnlitItemID{ get { return 0x1849; } } + public override int LitItemID => 0x184A; + public override int UnlitItemID => 0x1849; [Constructible] public HeatingStand() : base( 0x1849 ) @@ -57,4 +57,4 @@ namespace Server.Items int version = reader.ReadInt(); } } -} \ No newline at end of file +} diff --git a/Scripts/Items/Lights/LampPost1.cs b/Scripts/Items/Lights/LampPost1.cs index 500a4e660..457788f28 100644 --- a/Scripts/Items/Lights/LampPost1.cs +++ b/Scripts/Items/Lights/LampPost1.cs @@ -5,9 +5,9 @@ namespace Server.Items { public class LampPost1 : BaseLight { - public override int LitItemID{ get { return 0xB20; } } - public override int UnlitItemID{ get { return 0xB21; } } - + public override int LitItemID => 0xB20; + public override int UnlitItemID => 0xB21; + [Constructible] public LampPost1() : base( 0xB21 ) { @@ -34,4 +34,4 @@ namespace Server.Items int version = reader.ReadInt(); } } -} \ No newline at end of file +} diff --git a/Scripts/Items/Lights/LampPost2.cs b/Scripts/Items/Lights/LampPost2.cs index f7b75afe4..a8d19bcae 100644 --- a/Scripts/Items/Lights/LampPost2.cs +++ b/Scripts/Items/Lights/LampPost2.cs @@ -5,9 +5,9 @@ namespace Server.Items { public class LampPost2 : BaseLight { - public override int LitItemID{ get { return 0xB22; } } - public override int UnlitItemID{ get { return 0xB23; } } - + public override int LitItemID => 0xB22; + public override int UnlitItemID => 0xB23; + [Constructible] public LampPost2() : base( 0xB23 ) { @@ -34,4 +34,4 @@ namespace Server.Items int version = reader.ReadInt(); } } -} \ No newline at end of file +} diff --git a/Scripts/Items/Lights/LampPost3.cs b/Scripts/Items/Lights/LampPost3.cs index 1b382fa83..4b3b5dcd7 100644 --- a/Scripts/Items/Lights/LampPost3.cs +++ b/Scripts/Items/Lights/LampPost3.cs @@ -5,9 +5,9 @@ namespace Server.Items { public class LampPost3 : BaseLight { - public override int LitItemID{ get { return 0xB24; } } - public override int UnlitItemID{ get { return 0xB25; } } - + public override int LitItemID => 0xB24; + public override int UnlitItemID => 0xB25; + [Constructible] public LampPost3() : base( 0xb25 ) { @@ -34,4 +34,4 @@ namespace Server.Items int version = reader.ReadInt(); } } -} \ No newline at end of file +} diff --git a/Scripts/Items/Lights/Lantern.cs b/Scripts/Items/Lights/Lantern.cs index 98ea921fe..7ff99cbd2 100644 --- a/Scripts/Items/Lights/Lantern.cs +++ b/Scripts/Items/Lights/Lantern.cs @@ -59,7 +59,7 @@ namespace Server.Items public class LanternOfSouls : Lantern { - public override int LabelNumber{ get{ return 1061618; } } // Lantern of Souls + public override int LabelNumber => 1061618; // Lantern of Souls [Constructible] public LanternOfSouls() @@ -83,4 +83,4 @@ namespace Server.Items int version = reader.ReadInt(); } } -} \ No newline at end of file +} diff --git a/Scripts/Items/Lights/PaperLantern.cs b/Scripts/Items/Lights/PaperLantern.cs index c60f07a24..55cebfbeb 100644 --- a/Scripts/Items/Lights/PaperLantern.cs +++ b/Scripts/Items/Lights/PaperLantern.cs @@ -6,9 +6,9 @@ namespace Server.Items [Flippable] public class PaperLantern : BaseLight { - public override int LitItemID{ get { return 0x24BD; } } - public override int UnlitItemID{ get { return 0x24BE; } } - + public override int LitItemID => 0x24BD; + public override int UnlitItemID => 0x24BE; + [Constructible] public PaperLantern() : base( 0x24BE ) { @@ -35,4 +35,4 @@ namespace Server.Items int version = reader.ReadInt(); } } -} \ No newline at end of file +} diff --git a/Scripts/Items/Lights/RoundPaperLantern.cs b/Scripts/Items/Lights/RoundPaperLantern.cs index ecb4f50ac..c365d4667 100644 --- a/Scripts/Items/Lights/RoundPaperLantern.cs +++ b/Scripts/Items/Lights/RoundPaperLantern.cs @@ -6,9 +6,9 @@ namespace Server.Items [Flippable] public class RoundPaperLantern : BaseLight { - public override int LitItemID{ get { return 0x24C9; } } - public override int UnlitItemID{ get { return 0x24CA; } } - + public override int LitItemID => 0x24C9; + public override int UnlitItemID => 0x24CA; + [Constructible] public RoundPaperLantern() : base( 0x24CA ) { @@ -35,4 +35,4 @@ namespace Server.Items int version = reader.ReadInt(); } } -} \ No newline at end of file +} diff --git a/Scripts/Items/Lights/ShojiLantern.cs b/Scripts/Items/Lights/ShojiLantern.cs index f77b6c065..00ffe2d93 100644 --- a/Scripts/Items/Lights/ShojiLantern.cs +++ b/Scripts/Items/Lights/ShojiLantern.cs @@ -6,9 +6,9 @@ namespace Server.Items [Flippable] public class ShojiLantern : BaseLight { - public override int LitItemID{ get { return 0x24BB; } } - public override int UnlitItemID{ get { return 0x24BC; } } - + public override int LitItemID => 0x24BB; + public override int UnlitItemID => 0x24BC; + [Constructible] public ShojiLantern() : base( 0x24BC ) { @@ -35,4 +35,4 @@ namespace Server.Items int version = reader.ReadInt(); } } -} \ No newline at end of file +} diff --git a/Scripts/Items/Lights/Torch.cs b/Scripts/Items/Lights/Torch.cs index 9a0cc1c42..e248a2970 100644 --- a/Scripts/Items/Lights/Torch.cs +++ b/Scripts/Items/Lights/Torch.cs @@ -5,12 +5,12 @@ namespace Server.Items { public class Torch : BaseEquipableLight { - public override int LitItemID{ get { return 0xA12; } } - public override int UnlitItemID{ get { return 0xF6B; } } + public override int LitItemID => 0xA12; + public override int UnlitItemID => 0xF6B; + + public override int LitSound => 0x54; + public override int UnlitSound => 0x4BB; - public override int LitSound{ get { return 0x54; } } - public override int UnlitSound{ get { return 0x4BB; } } - [Constructible] public Torch() : base( 0xF6B ) { @@ -59,4 +59,4 @@ namespace Server.Items Weight = 1.0; } } -} \ No newline at end of file +} diff --git a/Scripts/Items/Maps/CityMap.cs b/Scripts/Items/Maps/CityMap.cs index 1940daba8..8700801ca 100644 --- a/Scripts/Items/Maps/CityMap.cs +++ b/Scripts/Items/Maps/CityMap.cs @@ -29,7 +29,7 @@ namespace Server.Items SetDisplay( from.X - dist, from.Y - dist, from.X + dist, from.Y + dist, size, size ); } - public override int LabelNumber{ get{ return 1015231; } } // city map + public override int LabelNumber => 1015231; // city map public CityMap( Serial serial ) : base( serial ) { @@ -49,4 +49,4 @@ namespace Server.Items int version = reader.ReadInt(); } } -} \ No newline at end of file +} diff --git a/Scripts/Items/Maps/IndecipherableMap.cs b/Scripts/Items/Maps/IndecipherableMap.cs index 88e8c2ec3..95222abd3 100644 --- a/Scripts/Items/Maps/IndecipherableMap.cs +++ b/Scripts/Items/Maps/IndecipherableMap.cs @@ -5,7 +5,7 @@ namespace Server.Items { public class IndecipherableMap : MapItem { - public override int LabelNumber{ get{ return 1070799; } } // indecipherable map + public override int LabelNumber => 1070799; // indecipherable map [Constructible] public IndecipherableMap() @@ -39,4 +39,4 @@ namespace Server.Items int version = reader.ReadEncodedInt(); } } -} \ No newline at end of file +} diff --git a/Scripts/Items/Maps/LocalMap.cs b/Scripts/Items/Maps/LocalMap.cs index a7e3219ea..00c8c43fe 100644 --- a/Scripts/Items/Maps/LocalMap.cs +++ b/Scripts/Items/Maps/LocalMap.cs @@ -19,7 +19,7 @@ namespace Server.Items SetDisplay( from.X - dist, from.Y - dist, from.X + dist, from.Y + dist, 200, 200 ); } - public override int LabelNumber{ get{ return 1015230; } } // local map + public override int LabelNumber => 1015230; // local map public LocalMap( Serial serial ) : base( serial ) { @@ -39,4 +39,4 @@ namespace Server.Items int version = reader.ReadInt(); } } -} \ No newline at end of file +} diff --git a/Scripts/Items/Maps/PresetMap.cs b/Scripts/Items/Maps/PresetMap.cs index 8cb2ccad1..1384a5cab 100644 --- a/Scripts/Items/Maps/PresetMap.cs +++ b/Scripts/Items/Maps/PresetMap.cs @@ -31,7 +31,7 @@ namespace Server.Items Bounds = entry.Bounds; } - public override int LabelNumber{ get{ return (m_LabelNumber == 0 ? base.LabelNumber : m_LabelNumber); } } + public override int LabelNumber => (m_LabelNumber == 0 ? base.LabelNumber : m_LabelNumber); public PresetMap( Serial serial ) : base( serial ) { @@ -148,4 +148,4 @@ namespace Server.Items Yew, YewToBritain } -} \ No newline at end of file +} diff --git a/Scripts/Items/Maps/SeaChart.cs b/Scripts/Items/Maps/SeaChart.cs index 8f1a56ff7..083d10701 100644 --- a/Scripts/Items/Maps/SeaChart.cs +++ b/Scripts/Items/Maps/SeaChart.cs @@ -29,7 +29,7 @@ namespace Server.Items SetDisplay( from.X - dist, from.Y - dist, from.X + dist, from.Y + dist, size, size ); } - public override int LabelNumber{ get{ return 1015232; } } // sea chart + public override int LabelNumber => 1015232; // sea chart public SeaChart( Serial serial ) : base( serial ) { @@ -49,4 +49,4 @@ namespace Server.Items int version = reader.ReadInt(); } } -} \ No newline at end of file +} diff --git a/Scripts/Items/Maps/WorldMap.cs b/Scripts/Items/Maps/WorldMap.cs index 2564fd4e9..57ac5908f 100644 --- a/Scripts/Items/Maps/WorldMap.cs +++ b/Scripts/Items/Maps/WorldMap.cs @@ -27,7 +27,7 @@ namespace Server.Items SetDisplay( 1344 - x20, 1600 - x20, 1472 + x20, 1728 + x20, size, size ); } - public override int LabelNumber{ get{ return 1015233; } } // world map + public override int LabelNumber => 1015233; // world map public WorldMap( Serial serial ) : base( serial ) { @@ -47,4 +47,4 @@ namespace Server.Items int version = reader.ReadInt(); } } -} \ No newline at end of file +} diff --git a/Scripts/Items/Minor Artifacts/AdmiralsHeartyRum.cs b/Scripts/Items/Minor Artifacts/AdmiralsHeartyRum.cs index 2da8b8a87..2107cd03e 100644 --- a/Scripts/Items/Minor Artifacts/AdmiralsHeartyRum.cs +++ b/Scripts/Items/Minor Artifacts/AdmiralsHeartyRum.cs @@ -5,8 +5,8 @@ namespace Server.Items { public class AdmiralsHeartyRum : BeverageBottle { - public override int LabelNumber{ get{ return 1063477; } } - + public override int LabelNumber => 1063477; + [Constructible] public AdmiralsHeartyRum() : base( BeverageType.Ale ) { @@ -23,7 +23,7 @@ namespace Server.Items writer.Write( (int) 0 ); } - + public override void Deserialize(GenericReader reader) { base.Deserialize( reader ); @@ -31,4 +31,4 @@ namespace Server.Items int version = reader.ReadInt(); } } -} \ No newline at end of file +} diff --git a/Scripts/Items/Minor Artifacts/AlchemistsBauble.cs b/Scripts/Items/Minor Artifacts/AlchemistsBauble.cs index c13babe58..580988cec 100644 --- a/Scripts/Items/Minor Artifacts/AlchemistsBauble.cs +++ b/Scripts/Items/Minor Artifacts/AlchemistsBauble.cs @@ -5,7 +5,7 @@ namespace Server.Items { public class AlchemistsBauble : GoldBracelet { - public override int LabelNumber{ get{ return 1070638; } } + public override int LabelNumber => 1070638; [Constructible] public AlchemistsBauble() @@ -27,7 +27,7 @@ namespace Server.Items writer.Write( (int) 0 ); } - + public override void Deserialize(GenericReader reader) { base.Deserialize( reader ); @@ -35,4 +35,4 @@ namespace Server.Items int version = reader.ReadInt(); } } -} \ No newline at end of file +} diff --git a/Scripts/Items/Minor Artifacts/ArcticDeathDealer.cs b/Scripts/Items/Minor Artifacts/ArcticDeathDealer.cs index 9363d9899..7fb5ffcc9 100644 --- a/Scripts/Items/Minor Artifacts/ArcticDeathDealer.cs +++ b/Scripts/Items/Minor Artifacts/ArcticDeathDealer.cs @@ -5,10 +5,10 @@ namespace Server.Items { public class ArcticDeathDealer : WarMace { - public override int LabelNumber{ get{ return 1063481; } } + public override int LabelNumber => 1063481; - public override int InitMinHits{ get{ return 255; } } - public override int InitMaxHits{ get{ return 255; } } + public override int InitMinHits => 255; + public override int InitMaxHits => 255; [Constructible] public ArcticDeathDealer() @@ -39,7 +39,7 @@ namespace Server.Items writer.Write( (int) 0 ); } - + public override void Deserialize(GenericReader reader) { base.Deserialize( reader ); @@ -47,4 +47,4 @@ namespace Server.Items int version = reader.ReadInt(); } } -} \ No newline at end of file +} diff --git a/Scripts/Items/Minor Artifacts/BlazeOfDeath.cs b/Scripts/Items/Minor Artifacts/BlazeOfDeath.cs index 0ff1d5b51..8c0790df5 100644 --- a/Scripts/Items/Minor Artifacts/BlazeOfDeath.cs +++ b/Scripts/Items/Minor Artifacts/BlazeOfDeath.cs @@ -5,10 +5,10 @@ namespace Server.Items { public class BlazeOfDeath : Halberd { - public override int LabelNumber{ get{ return 1063486; } } + public override int LabelNumber => 1063486; - public override int InitMinHits{ get{ return 255; } } - public override int InitMaxHits{ get{ return 255; } } + public override int InitMinHits => 255; + public override int InitMaxHits => 255; [Constructible] public BlazeOfDeath() @@ -40,7 +40,7 @@ namespace Server.Items writer.Write( (int) 0 ); } - + public override void Deserialize(GenericReader reader) { base.Deserialize( reader ); @@ -48,4 +48,4 @@ namespace Server.Items int version = reader.ReadInt(); } } -} \ No newline at end of file +} diff --git a/Scripts/Items/Minor Artifacts/BowOfTheJukaKing.cs b/Scripts/Items/Minor Artifacts/BowOfTheJukaKing.cs index 1b7993692..f49566908 100644 --- a/Scripts/Items/Minor Artifacts/BowOfTheJukaKing.cs +++ b/Scripts/Items/Minor Artifacts/BowOfTheJukaKing.cs @@ -5,10 +5,10 @@ namespace Server.Items { public class BowOfTheJukaKing : Bow { - public override int LabelNumber{ get{ return 1070636; } } + public override int LabelNumber => 1070636; - public override int InitMinHits{ get{ return 255; } } - public override int InitMaxHits{ get{ return 255; } } + public override int InitMinHits => 255; + public override int InitMaxHits => 255; [Constructible] public BowOfTheJukaKing() @@ -30,7 +30,7 @@ namespace Server.Items writer.Write( (int) 0 ); } - + public override void Deserialize(GenericReader reader) { base.Deserialize( reader ); @@ -38,4 +38,4 @@ namespace Server.Items int version = reader.ReadInt(); } } -} \ No newline at end of file +} diff --git a/Scripts/Items/Minor Artifacts/BurglarsBandana.cs b/Scripts/Items/Minor Artifacts/BurglarsBandana.cs index 22ccffb38..d400747f0 100644 --- a/Scripts/Items/Minor Artifacts/BurglarsBandana.cs +++ b/Scripts/Items/Minor Artifacts/BurglarsBandana.cs @@ -5,16 +5,16 @@ namespace Server.Items { public class BurglarsBandana : Bandana { - public override int LabelNumber{ get{ return 1063473; } } + public override int LabelNumber => 1063473; - public override int BasePhysicalResistance{ get{ return 10; } } - public override int BaseFireResistance{ get{ return 5; } } - public override int BaseColdResistance{ get{ return 7; } } - public override int BasePoisonResistance{ get{ return 10; } } - public override int BaseEnergyResistance{ get{ return 10; } } + public override int BasePhysicalResistance => 10; + public override int BaseFireResistance => 5; + public override int BaseColdResistance => 7; + public override int BasePoisonResistance => 10; + public override int BaseEnergyResistance => 10; - public override int InitMinHits{ get{ return 255; } } - public override int InitMaxHits{ get{ return 255; } } + public override int InitMinHits => 255; + public override int InitMaxHits => 255; [Constructible] public BurglarsBandana() @@ -31,14 +31,14 @@ namespace Server.Items public BurglarsBandana( Serial serial ) : base( serial ) { } - + public override void Serialize( GenericWriter writer ) { base.Serialize( writer ); writer.Write( (int) 2 ); } - + public override void Deserialize(GenericReader reader) { base.Deserialize( reader ); @@ -55,4 +55,4 @@ namespace Server.Items } } } -} \ No newline at end of file +} diff --git a/Scripts/Items/Minor Artifacts/CandelabraOfSouls.cs b/Scripts/Items/Minor Artifacts/CandelabraOfSouls.cs index 5ebe479f6..619a5ce2c 100644 --- a/Scripts/Items/Minor Artifacts/CandelabraOfSouls.cs +++ b/Scripts/Items/Minor Artifacts/CandelabraOfSouls.cs @@ -5,8 +5,8 @@ namespace Server.Items { public class CandelabraOfSouls : Item { - public override int LabelNumber{ get{ return 1063478; } } - + public override int LabelNumber => 1063478; + [Constructible] public CandelabraOfSouls() : base( 0xB26 ) { @@ -22,7 +22,7 @@ namespace Server.Items writer.Write( (int) 0 ); } - + public override void Deserialize(GenericReader reader) { base.Deserialize( reader ); @@ -30,4 +30,4 @@ namespace Server.Items int version = reader.ReadInt(); } } -} \ No newline at end of file +} diff --git a/Scripts/Items/Minor Artifacts/CaptainQuacklebushsCutlass.cs b/Scripts/Items/Minor Artifacts/CaptainQuacklebushsCutlass.cs index 92fe11c85..420c8e59d 100644 --- a/Scripts/Items/Minor Artifacts/CaptainQuacklebushsCutlass.cs +++ b/Scripts/Items/Minor Artifacts/CaptainQuacklebushsCutlass.cs @@ -5,10 +5,10 @@ namespace Server.Items { public class CaptainQuacklebushsCutlass : Cutlass { - public override int LabelNumber{ get{ return 1063474; } } + public override int LabelNumber => 1063474; - public override int InitMinHits{ get{ return 255; } } - public override int InitMaxHits{ get{ return 255; } } + public override int InitMinHits => 255; + public override int InitMaxHits => 255; [Constructible] public CaptainQuacklebushsCutlass() @@ -31,7 +31,7 @@ namespace Server.Items writer.Write( (int) 0 ); } - + public override void Deserialize(GenericReader reader) { base.Deserialize( reader ); @@ -42,4 +42,4 @@ namespace Server.Items Attributes.AttackChance = 10; } } -} \ No newline at end of file +} diff --git a/Scripts/Items/Minor Artifacts/CavortingClub.cs b/Scripts/Items/Minor Artifacts/CavortingClub.cs index ac5cd24cb..ce68cc51a 100644 --- a/Scripts/Items/Minor Artifacts/CavortingClub.cs +++ b/Scripts/Items/Minor Artifacts/CavortingClub.cs @@ -5,10 +5,10 @@ namespace Server.Items { public class CavortingClub : Club { - public override int LabelNumber{ get{ return 1063472; } } + public override int LabelNumber => 1063472; - public override int InitMinHits{ get{ return 255; } } - public override int InitMaxHits{ get{ return 255; } } + public override int InitMinHits => 255; + public override int InitMaxHits => 255; [Constructible] public CavortingClub() @@ -33,7 +33,7 @@ namespace Server.Items writer.Write( (int) 0 ); } - + public override void Deserialize(GenericReader reader) { base.Deserialize( reader ); @@ -41,4 +41,4 @@ namespace Server.Items int version = reader.ReadInt(); } } -} \ No newline at end of file +} diff --git a/Scripts/Items/Minor Artifacts/ColdBlood.cs b/Scripts/Items/Minor Artifacts/ColdBlood.cs index aee7feaff..5da56b313 100644 --- a/Scripts/Items/Minor Artifacts/ColdBlood.cs +++ b/Scripts/Items/Minor Artifacts/ColdBlood.cs @@ -5,10 +5,10 @@ namespace Server.Items { public class ColdBlood : Cleaver { - public override int LabelNumber{ get{ return 1070818; } } // Cold Blood + public override int LabelNumber => 1070818; // Cold Blood - public override int InitMinHits{ get{ return 255; } } - public override int InitMaxHits{ get{ return 255; } } + public override int InitMinHits => 255; + public override int InitMaxHits => 255; [Constructible] public ColdBlood() @@ -39,7 +39,7 @@ namespace Server.Items writer.Write( (int) 0 ); } - + public override void Deserialize(GenericReader reader) { base.Deserialize( reader ); @@ -47,4 +47,4 @@ namespace Server.Items int version = reader.ReadInt(); } } -} \ No newline at end of file +} diff --git a/Scripts/Items/Minor Artifacts/DreadPirateHat.cs b/Scripts/Items/Minor Artifacts/DreadPirateHat.cs index ddd2b9a28..717cefbd2 100644 --- a/Scripts/Items/Minor Artifacts/DreadPirateHat.cs +++ b/Scripts/Items/Minor Artifacts/DreadPirateHat.cs @@ -5,13 +5,13 @@ namespace Server.Items { public class DreadPirateHat : TricorneHat { - public override int LabelNumber{ get{ return 1063467; } } + public override int LabelNumber => 1063467; - public override int BaseColdResistance{ get{ return 14; } } - public override int BasePoisonResistance{ get{ return 10; } } + public override int BaseColdResistance => 14; + public override int BasePoisonResistance => 10; - public override int InitMinHits{ get{ return 255; } } - public override int InitMaxHits{ get{ return 255; } } + public override int InitMinHits => 255; + public override int InitMaxHits => 255; [Constructible] public DreadPirateHat() @@ -28,14 +28,14 @@ namespace Server.Items public DreadPirateHat( Serial serial ) : base( serial ) { } - + public override void Serialize( GenericWriter writer ) { base.Serialize( writer ); writer.Write( (int) 3 ); } - + public override void Deserialize(GenericReader reader) { base.Deserialize( reader ); @@ -58,4 +58,4 @@ namespace Server.Items } } } -} \ No newline at end of file +} diff --git a/Scripts/Items/Minor Artifacts/EnchantedTitanLegBone.cs b/Scripts/Items/Minor Artifacts/EnchantedTitanLegBone.cs index da2895007..63eb6fb74 100644 --- a/Scripts/Items/Minor Artifacts/EnchantedTitanLegBone.cs +++ b/Scripts/Items/Minor Artifacts/EnchantedTitanLegBone.cs @@ -5,10 +5,10 @@ namespace Server.Items { public class EnchantedTitanLegBone : ShortSpear { - public override int LabelNumber{ get{ return 1063482; } } + public override int LabelNumber => 1063482; - public override int InitMinHits{ get{ return 255; } } - public override int InitMaxHits{ get{ return 255; } } + public override int InitMinHits => 255; + public override int InitMaxHits => 255; [Constructible] public EnchantedTitanLegBone() @@ -31,7 +31,7 @@ namespace Server.Items writer.Write( (int) 0 ); } - + public override void Deserialize(GenericReader reader) { base.Deserialize( reader ); @@ -39,4 +39,4 @@ namespace Server.Items int version = reader.ReadInt(); } } -} \ No newline at end of file +} diff --git a/Scripts/Items/Minor Artifacts/GhostShipAnchor.cs b/Scripts/Items/Minor Artifacts/GhostShipAnchor.cs index d0dc17e27..8af480e28 100644 --- a/Scripts/Items/Minor Artifacts/GhostShipAnchor.cs +++ b/Scripts/Items/Minor Artifacts/GhostShipAnchor.cs @@ -5,8 +5,8 @@ namespace Server.Items { public class GhostShipAnchor : Item { - public override int LabelNumber{ get{ return 1070816; } } // Ghost Ship Anchor - + public override int LabelNumber => 1070816; // Ghost Ship Anchor + [Constructible] public GhostShipAnchor() : base( 0x14F7 ) { @@ -23,7 +23,7 @@ namespace Server.Items writer.Write( (int) 0 ); } - + public override void Deserialize(GenericReader reader) { base.Deserialize( reader ); @@ -34,4 +34,4 @@ namespace Server.Items ItemID = 0x14F7; } } -} \ No newline at end of file +} diff --git a/Scripts/Items/Minor Artifacts/GlovesOfThePugilist.cs b/Scripts/Items/Minor Artifacts/GlovesOfThePugilist.cs index d6bc69094..9bff4321f 100644 --- a/Scripts/Items/Minor Artifacts/GlovesOfThePugilist.cs +++ b/Scripts/Items/Minor Artifacts/GlovesOfThePugilist.cs @@ -5,12 +5,12 @@ namespace Server.Items { public class GlovesOfThePugilist : LeatherGloves { - public override int LabelNumber{ get{ return 1070690; } } + public override int LabelNumber => 1070690; - public override int BasePhysicalResistance{ get{ return 18; } } + public override int BasePhysicalResistance => 18; - public override int InitMinHits{ get{ return 255; } } - public override int InitMaxHits{ get{ return 255; } } + public override int InitMinHits => 255; + public override int InitMaxHits => 255; [Constructible] public GlovesOfThePugilist() @@ -31,7 +31,7 @@ namespace Server.Items writer.Write( (int) 0 ); } - + public override void Deserialize(GenericReader reader) { base.Deserialize( reader ); @@ -39,4 +39,4 @@ namespace Server.Items int version = reader.ReadInt(); } } -} \ No newline at end of file +} diff --git a/Scripts/Items/Minor Artifacts/GoldBricks.cs b/Scripts/Items/Minor Artifacts/GoldBricks.cs index 75fdb4610..dfa48230b 100644 --- a/Scripts/Items/Minor Artifacts/GoldBricks.cs +++ b/Scripts/Items/Minor Artifacts/GoldBricks.cs @@ -5,8 +5,8 @@ namespace Server.Items { public class GoldBricks : Item { - public override int LabelNumber{ get{ return 1063489; } } - + public override int LabelNumber => 1063489; + [Constructible] public GoldBricks() : base( 0x1BEB ) { @@ -22,7 +22,7 @@ namespace Server.Items writer.Write( (int) 0 ); } - + public override void Deserialize(GenericReader reader) { base.Deserialize( reader ); @@ -30,4 +30,4 @@ namespace Server.Items int version = reader.ReadInt(); } } -} \ No newline at end of file +} diff --git a/Scripts/Items/Minor Artifacts/GwennosHarp.cs b/Scripts/Items/Minor Artifacts/GwennosHarp.cs index cbccb3a51..2d9c6537c 100644 --- a/Scripts/Items/Minor Artifacts/GwennosHarp.cs +++ b/Scripts/Items/Minor Artifacts/GwennosHarp.cs @@ -5,10 +5,10 @@ namespace Server.Items { public class GwennosHarp : LapHarp { - public override int LabelNumber{ get{ return 1063480; } } + public override int LabelNumber => 1063480; - public override int InitMinUses{ get{ return 1600; } } - public override int InitMaxUses{ get{ return 1600; } } + public override int InitMinUses => 1600; + public override int InitMaxUses => 1600; [Constructible] public GwennosHarp() @@ -36,4 +36,4 @@ namespace Server.Items int version = reader.ReadInt(); } } -} \ No newline at end of file +} diff --git a/Scripts/Items/Minor Artifacts/HeartOfTheLion.cs b/Scripts/Items/Minor Artifacts/HeartOfTheLion.cs index 40b9e538f..51beae6fa 100644 --- a/Scripts/Items/Minor Artifacts/HeartOfTheLion.cs +++ b/Scripts/Items/Minor Artifacts/HeartOfTheLion.cs @@ -5,16 +5,16 @@ namespace Server.Items { public class HeartOfTheLion : PlateChest { - public override int LabelNumber{ get{ return 1070817; } } // Heart of the Lion + public override int LabelNumber => 1070817; // Heart of the Lion - public override int BasePhysicalResistance{ get{ return 15; } } - public override int BaseFireResistance{ get{ return 10; } } - public override int BaseColdResistance{ get{ return 10; } } - public override int BasePoisonResistance{ get{ return 10; } } - public override int BaseEnergyResistance{ get{ return 10; } } + public override int BasePhysicalResistance => 15; + public override int BaseFireResistance => 10; + public override int BaseColdResistance => 10; + public override int BasePoisonResistance => 10; + public override int BaseEnergyResistance => 10; - public override int InitMinHits{ get{ return 255; } } - public override int InitMaxHits{ get{ return 255; } } + public override int InitMinHits => 255; + public override int InitMaxHits => 255; [Constructible] public HeartOfTheLion() @@ -36,7 +36,7 @@ namespace Server.Items writer.Write( (int) 0 ); } - + public override void Deserialize(GenericReader reader) { base.Deserialize( reader ); @@ -44,4 +44,4 @@ namespace Server.Items int version = reader.ReadInt(); } } -} \ No newline at end of file +} diff --git a/Scripts/Items/Minor Artifacts/IolosLute.cs b/Scripts/Items/Minor Artifacts/IolosLute.cs index 2882d9e63..92ddc0aa4 100644 --- a/Scripts/Items/Minor Artifacts/IolosLute.cs +++ b/Scripts/Items/Minor Artifacts/IolosLute.cs @@ -5,10 +5,10 @@ namespace Server.Items { public class IolosLute : Lute { - public override int LabelNumber{ get{ return 1063479; } } + public override int LabelNumber => 1063479; - public override int InitMinUses{ get{ return 1600; } } - public override int InitMaxUses{ get{ return 1600; } } + public override int InitMinUses => 1600; + public override int InitMaxUses => 1600; [Constructible] public IolosLute() @@ -37,4 +37,4 @@ namespace Server.Items int version = reader.ReadInt(); } } -} \ No newline at end of file +} diff --git a/Scripts/Items/Minor Artifacts/LunaLance.cs b/Scripts/Items/Minor Artifacts/LunaLance.cs index a82ccfa03..86d8bb978 100644 --- a/Scripts/Items/Minor Artifacts/LunaLance.cs +++ b/Scripts/Items/Minor Artifacts/LunaLance.cs @@ -5,10 +5,10 @@ namespace Server.Items { public class LunaLance : Lance { - public override int LabelNumber{ get{ return 1063469; } } + public override int LabelNumber => 1063469; - public override int InitMinHits{ get{ return 255; } } - public override int InitMaxHits{ get{ return 255; } } + public override int InitMinHits => 255; + public override int InitMaxHits => 255; [Constructible] public LunaLance() @@ -31,7 +31,7 @@ namespace Server.Items writer.Write( (int) 0 ); } - + public override void Deserialize(GenericReader reader) { base.Deserialize( reader ); @@ -39,4 +39,4 @@ namespace Server.Items int version = reader.ReadInt(); } } -} \ No newline at end of file +} diff --git a/Scripts/Items/Minor Artifacts/ML/AegisOfGrace.cs b/Scripts/Items/Minor Artifacts/ML/AegisOfGrace.cs index 17e2cfbab..df3df67fa 100644 --- a/Scripts/Items/Minor Artifacts/ML/AegisOfGrace.cs +++ b/Scripts/Items/Minor Artifacts/ML/AegisOfGrace.cs @@ -6,19 +6,19 @@ namespace Server.Items { public class AegisOfGrace : DragonHelm { - public override int LabelNumber{ get{ return 1075047; } } // Aegis of Grace + public override int LabelNumber => 1075047; // Aegis of Grace - public override int BasePhysicalResistance{ get{ return 10; } } - public override int BaseFireResistance{ get{ return 9; } } - public override int BaseColdResistance{ get{ return 7; } } - public override int BasePoisonResistance{ get{ return 7; } } - public override int BaseEnergyResistance{ get{ return 15; } } + public override int BasePhysicalResistance => 10; + public override int BaseFireResistance => 9; + public override int BaseColdResistance => 7; + public override int BasePoisonResistance => 7; + public override int BaseEnergyResistance => 15; - public override ArmorMaterialType MaterialType{ get{ return ArmorMaterialType.Dragon; } } - public override CraftResource DefaultResource{ get{ return CraftResource.Iron; } } + public override ArmorMaterialType MaterialType => ArmorMaterialType.Dragon; + public override CraftResource DefaultResource => CraftResource.Iron; - public override int InitMinHits{ get{ return 255; } } - public override int InitMaxHits{ get{ return 255; } } + public override int InitMinHits => 255; + public override int InitMaxHits => 255; [Constructible] public AegisOfGrace() @@ -56,4 +56,4 @@ namespace Server.Items int version = reader.ReadEncodedInt(); } } -} \ No newline at end of file +} diff --git a/Scripts/Items/Minor Artifacts/ML/BladeDance.cs b/Scripts/Items/Minor Artifacts/ML/BladeDance.cs index 3f00b6d57..0367d5e17 100644 --- a/Scripts/Items/Minor Artifacts/ML/BladeDance.cs +++ b/Scripts/Items/Minor Artifacts/ML/BladeDance.cs @@ -6,10 +6,10 @@ namespace Server.Items { public class BladeDance : RuneBlade { - public override int LabelNumber{ get{ return 1075033; } } // Blade Dance + public override int LabelNumber => 1075033; // Blade Dance - public override int InitMinHits{ get{ return 255; } } - public override int InitMaxHits{ get{ return 255; } } + public override int InitMinHits => 255; + public override int InitMaxHits => 255; [Constructible] public BladeDance() @@ -41,4 +41,4 @@ namespace Server.Items int version = reader.ReadEncodedInt(); } } -} \ No newline at end of file +} diff --git a/Scripts/Items/Minor Artifacts/ML/BloodwoodSpirit.cs b/Scripts/Items/Minor Artifacts/ML/BloodwoodSpirit.cs index 1db481fba..b38304819 100644 --- a/Scripts/Items/Minor Artifacts/ML/BloodwoodSpirit.cs +++ b/Scripts/Items/Minor Artifacts/ML/BloodwoodSpirit.cs @@ -5,7 +5,7 @@ namespace Server.Items { public class BloodwoodSpirit : BaseTalisman { - public override int LabelNumber{ get{ return 1075034; } } // Bloodwood Spirit + public override int LabelNumber => 1075034; // Bloodwood Spirit public override bool ForceShowName => true; [Constructible] diff --git a/Scripts/Items/Minor Artifacts/ML/Bonesmasher.cs b/Scripts/Items/Minor Artifacts/ML/Bonesmasher.cs index e7635f0f4..ebe10c8e1 100644 --- a/Scripts/Items/Minor Artifacts/ML/Bonesmasher.cs +++ b/Scripts/Items/Minor Artifacts/ML/Bonesmasher.cs @@ -6,10 +6,10 @@ namespace Server.Items { public class Bonesmasher : DiamondMace { - public override int LabelNumber{ get{ return 1075030; } } // Bonesmasher + public override int LabelNumber => 1075030; // Bonesmasher - public override int InitMinHits{ get{ return 255; } } - public override int InitMaxHits{ get{ return 255; } } + public override int InitMinHits => 255; + public override int InitMaxHits => 255; [Constructible] public Bonesmasher() @@ -41,4 +41,4 @@ namespace Server.Items int version = reader.ReadEncodedInt(); } } -} \ No newline at end of file +} diff --git a/Scripts/Items/Minor Artifacts/ML/Boomstick.cs b/Scripts/Items/Minor Artifacts/ML/Boomstick.cs index e632405ef..2f621411d 100644 --- a/Scripts/Items/Minor Artifacts/ML/Boomstick.cs +++ b/Scripts/Items/Minor Artifacts/ML/Boomstick.cs @@ -6,16 +6,16 @@ namespace Server.Items { public class Boomstick : WildStaff { - public override int LabelNumber{ get{ return 1075032; } } // Boomstick + public override int LabelNumber => 1075032; // Boomstick - public override int InitMinHits{ get{ return 255; } } - public override int InitMaxHits{ get{ return 255; } } + public override int InitMinHits => 255; + public override int InitMaxHits => 255; [Constructible] - public Boomstick() : base() + public Boomstick() { Hue = 0x25; - + Attributes.SpellChanneling = 1; Attributes.RegenMana = 3; Attributes.CastSpeed = 1; diff --git a/Scripts/Items/Minor Artifacts/ML/BrightsightLenses.cs b/Scripts/Items/Minor Artifacts/ML/BrightsightLenses.cs index 053648f82..201b936eb 100644 --- a/Scripts/Items/Minor Artifacts/ML/BrightsightLenses.cs +++ b/Scripts/Items/Minor Artifacts/ML/BrightsightLenses.cs @@ -5,19 +5,19 @@ namespace Server.Items { public class BrightsightLenses : ElvenGlasses { - public override int LabelNumber{ get{ return 1075039; } } // Brightsight Lenses + public override int LabelNumber => 1075039; // Brightsight Lenses - public override int BasePhysicalResistance{ get{ return 9; } } - public override int BaseFireResistance{ get{ return 29; } } - public override int BaseColdResistance{ get{ return 7; } } - public override int BasePoisonResistance{ get{ return 8; } } - public override int BaseEnergyResistance{ get{ return 7; } } + public override int BasePhysicalResistance => 9; + public override int BaseFireResistance => 29; + public override int BaseColdResistance => 7; + public override int BasePoisonResistance => 8; + public override int BaseEnergyResistance => 7; - public override int InitMinHits{ get{ return 255; } } - public override int InitMaxHits{ get{ return 255; } } + public override int InitMinHits => 255; + public override int InitMaxHits => 255; [Constructible] - public BrightsightLenses() : base() + public BrightsightLenses() { Hue = 0x501; diff --git a/Scripts/Items/Minor Artifacts/ML/FeyLeggings.cs b/Scripts/Items/Minor Artifacts/ML/FeyLeggings.cs index 3b67eff9e..1c07bd735 100644 --- a/Scripts/Items/Minor Artifacts/ML/FeyLeggings.cs +++ b/Scripts/Items/Minor Artifacts/ML/FeyLeggings.cs @@ -6,16 +6,16 @@ namespace Server.Items { public class FeyLeggings : ChainLegs { - public override int LabelNumber{ get{ return 1075041; } } // Fey Leggings + public override int LabelNumber => 1075041; // Fey Leggings - public override int BasePhysicalResistance{ get{ return 12; } } - public override int BaseFireResistance{ get{ return 8; } } - public override int BaseColdResistance{ get{ return 7; } } - public override int BasePoisonResistance{ get{ return 4; } } - public override int BaseEnergyResistance{ get{ return 19; } } + public override int BasePhysicalResistance => 12; + public override int BaseFireResistance => 8; + public override int BaseColdResistance => 7; + public override int BasePoisonResistance => 4; + public override int BaseEnergyResistance => 19; - public override int InitMinHits{ get{ return 255; } } - public override int InitMaxHits{ get { return 255; } } + public override int InitMinHits => 255; + public override int InitMaxHits => 255; [Constructible] @@ -27,7 +27,7 @@ namespace Server.Items ArmorAttributes.MageArmor = 1; } - public override Race RequiredRace { get { return Race.Elf; } } + public override Race RequiredRace => Race.Elf; public FeyLeggings( Serial serial ) : base( serial ) { @@ -47,4 +47,4 @@ namespace Server.Items int version = reader.ReadEncodedInt(); } } -} \ No newline at end of file +} diff --git a/Scripts/Items/Minor Artifacts/ML/FleshRipper.cs b/Scripts/Items/Minor Artifacts/ML/FleshRipper.cs index 7f7d20316..d9c9fc2e6 100644 --- a/Scripts/Items/Minor Artifacts/ML/FleshRipper.cs +++ b/Scripts/Items/Minor Artifacts/ML/FleshRipper.cs @@ -6,10 +6,10 @@ namespace Server.Items { public class FleshRipper : AssassinSpike { - public override int LabelNumber{ get{ return 1075045; } } // Flesh Ripper + public override int LabelNumber => 1075045; // Flesh Ripper - public override int InitMinHits{ get{ return 255; } } - public override int InitMaxHits{ get{ return 255; } } + public override int InitMinHits => 255; + public override int InitMaxHits => 255; [Constructible] public FleshRipper() @@ -44,4 +44,4 @@ namespace Server.Items int version = reader.ReadEncodedInt(); } } -} \ No newline at end of file +} diff --git a/Scripts/Items/Minor Artifacts/ML/HelmOfSwiftness.cs b/Scripts/Items/Minor Artifacts/ML/HelmOfSwiftness.cs index d43c1375a..6cfa50171 100644 --- a/Scripts/Items/Minor Artifacts/ML/HelmOfSwiftness.cs +++ b/Scripts/Items/Minor Artifacts/ML/HelmOfSwiftness.cs @@ -5,22 +5,22 @@ namespace Server.Items { public class HelmOfSwiftness : WingedHelm { - public override int LabelNumber{ get{ return 1075037; } } // Helm of Swiftness - - public override int BasePhysicalResistance{ get{ return 6; } } - public override int BaseFireResistance{ get{ return 5; } } - public override int BaseColdResistance{ get{ return 6; } } - public override int BasePoisonResistance{ get{ return 6; } } - public override int BaseEnergyResistance{ get{ return 8; } } + public override int LabelNumber => 1075037; // Helm of Swiftness - public override int InitMinHits{ get{ return 255; } } - public override int InitMaxHits{ get{ return 255; } } + public override int BasePhysicalResistance => 6; + public override int BaseFireResistance => 5; + public override int BaseColdResistance => 6; + public override int BasePoisonResistance => 6; + public override int BaseEnergyResistance => 8; + + public override int InitMinHits => 255; + public override int InitMaxHits => 255; [Constructible] - public HelmOfSwiftness() : base() + public HelmOfSwiftness() { Hue = 0x592; - + Attributes.BonusInt = 5; Attributes.CastSpeed = 1; Attributes.CastRecovery = 2; diff --git a/Scripts/Items/Minor Artifacts/ML/MelisandesCorrodedHatchet.cs b/Scripts/Items/Minor Artifacts/ML/MelisandesCorrodedHatchet.cs index 90690b8a1..4fc9b8055 100644 --- a/Scripts/Items/Minor Artifacts/ML/MelisandesCorrodedHatchet.cs +++ b/Scripts/Items/Minor Artifacts/ML/MelisandesCorrodedHatchet.cs @@ -6,7 +6,7 @@ namespace Server.Items { public class MelisandesCorrodedHatchet : Hatchet { - public override int LabelNumber{ get{ return 1072115; } } // Melisande's Corroded Hatchet + public override int LabelNumber => 1072115; // Melisande's Corroded Hatchet [Constructible] public MelisandesCorrodedHatchet() @@ -40,4 +40,4 @@ namespace Server.Items int version = reader.ReadEncodedInt(); } } -} \ No newline at end of file +} diff --git a/Scripts/Items/Minor Artifacts/ML/PadsOfTheCuSidhe.cs b/Scripts/Items/Minor Artifacts/ML/PadsOfTheCuSidhe.cs index e98761f48..24d5e3409 100644 --- a/Scripts/Items/Minor Artifacts/ML/PadsOfTheCuSidhe.cs +++ b/Scripts/Items/Minor Artifacts/ML/PadsOfTheCuSidhe.cs @@ -5,7 +5,7 @@ namespace Server.Items { public class PadsOfTheCuSidhe : FurBoots { - public override int LabelNumber{ get{ return 1075048; } } // Pads of the Cu Sidhe + public override int LabelNumber => 1075048; // Pads of the Cu Sidhe [Constructible] public PadsOfTheCuSidhe() : base( 0x47E ) @@ -30,4 +30,4 @@ namespace Server.Items int version = reader.ReadEncodedInt(); } } -} \ No newline at end of file +} diff --git a/Scripts/Items/Minor Artifacts/ML/QuiverOfElements.cs b/Scripts/Items/Minor Artifacts/ML/QuiverOfElements.cs index 039781ae4..c880a16bd 100644 --- a/Scripts/Items/Minor Artifacts/ML/QuiverOfElements.cs +++ b/Scripts/Items/Minor Artifacts/ML/QuiverOfElements.cs @@ -5,10 +5,10 @@ namespace Server.Items { public class QuiverOfElements : BaseQuiver { - public override int LabelNumber{ get{ return 1075040; } } // Quiver of the Elements + public override int LabelNumber => 1075040; // Quiver of the Elements [Constructible] - public QuiverOfElements() : base() + public QuiverOfElements() { Hue = 0xEB; WeightReduction = 50; diff --git a/Scripts/Items/Minor Artifacts/ML/QuiverOfRage.cs b/Scripts/Items/Minor Artifacts/ML/QuiverOfRage.cs index d04063795..b26283037 100644 --- a/Scripts/Items/Minor Artifacts/ML/QuiverOfRage.cs +++ b/Scripts/Items/Minor Artifacts/ML/QuiverOfRage.cs @@ -5,10 +5,10 @@ namespace Server.Items { public class QuiverOfRage : BaseQuiver { - public override int LabelNumber{ get{ return 1075038; } } // Quiver of Rage + public override int LabelNumber => 1075038; // Quiver of Rage [Constructible] - public QuiverOfRage() : base() + public QuiverOfRage() { Hue = 0x24C; diff --git a/Scripts/Items/Minor Artifacts/ML/RaedsGlory.cs b/Scripts/Items/Minor Artifacts/ML/RaedsGlory.cs index ae6716f8f..7fb85ffb4 100644 --- a/Scripts/Items/Minor Artifacts/ML/RaedsGlory.cs +++ b/Scripts/Items/Minor Artifacts/ML/RaedsGlory.cs @@ -6,10 +6,10 @@ namespace Server.Items { public class RaedsGlory : WarCleaver { - public override int LabelNumber{ get{ return 1075036; } } // Raed's Glory + public override int LabelNumber => 1075036; // Raed's Glory - public override int InitMinHits{ get{ return 255; } } - public override int InitMaxHits{ get{ return 255; } } + public override int InitMinHits => 255; + public override int InitMaxHits => 255; [Constructible] public RaedsGlory() @@ -42,4 +42,4 @@ namespace Server.Items int version = reader.ReadEncodedInt(); } } -} \ No newline at end of file +} diff --git a/Scripts/Items/Minor Artifacts/ML/RighteousAnger.cs b/Scripts/Items/Minor Artifacts/ML/RighteousAnger.cs index 68c1369af..8e65f7e5c 100644 --- a/Scripts/Items/Minor Artifacts/ML/RighteousAnger.cs +++ b/Scripts/Items/Minor Artifacts/ML/RighteousAnger.cs @@ -6,10 +6,10 @@ namespace Server.Items { public class RighteousAnger : ElvenMachete { - public override int LabelNumber{ get{ return 1075049; } } // Righteous Anger + public override int LabelNumber => 1075049; // Righteous Anger - public override int InitMinHits{ get{ return 255; } } - public override int InitMaxHits{ get{ return 255; } } + public override int InitMinHits => 255; + public override int InitMaxHits => 255; [Constructible] public RighteousAnger() @@ -40,4 +40,4 @@ namespace Server.Items int version = reader.ReadEncodedInt(); } } -} \ No newline at end of file +} diff --git a/Scripts/Items/Minor Artifacts/ML/RobeOfTheEclipse.cs b/Scripts/Items/Minor Artifacts/ML/RobeOfTheEclipse.cs index aa535a26d..ac5f7a3f2 100644 --- a/Scripts/Items/Minor Artifacts/ML/RobeOfTheEclipse.cs +++ b/Scripts/Items/Minor Artifacts/ML/RobeOfTheEclipse.cs @@ -6,7 +6,7 @@ namespace Server.Items [Flippable( 0x1F03, 0x1F04 )] public class RobeOfTheEclipse : BaseOuterTorso { - public override int LabelNumber{ get{ return 1075082; } } // Robe of the Eclipse + public override int LabelNumber => 1075082; // Robe of the Eclipse [Constructible] public RobeOfTheEclipse() : base( 0x1F03, 0x486 ) @@ -36,4 +36,4 @@ namespace Server.Items int version = reader.ReadEncodedInt(); } } -} \ No newline at end of file +} diff --git a/Scripts/Items/Minor Artifacts/ML/RobeOfTheEquinox.cs b/Scripts/Items/Minor Artifacts/ML/RobeOfTheEquinox.cs index 317fd936f..9b9364743 100644 --- a/Scripts/Items/Minor Artifacts/ML/RobeOfTheEquinox.cs +++ b/Scripts/Items/Minor Artifacts/ML/RobeOfTheEquinox.cs @@ -6,7 +6,7 @@ namespace Server.Items [Flippable( 0x1F03, 0x1F04 )] public class RobeOfTheEquinox : BaseOuterTorso { - public override int LabelNumber{ get{ return 1075042; } } // Robe of the Equinox + public override int LabelNumber => 1075042; // Robe of the Equinox [Constructible] public RobeOfTheEquinox() : base( 0x1F04, 0xD6 ) @@ -37,4 +37,4 @@ namespace Server.Items int version = reader.ReadEncodedInt(); } } -} \ No newline at end of file +} diff --git a/Scripts/Items/Minor Artifacts/ML/SoulSeeker.cs b/Scripts/Items/Minor Artifacts/ML/SoulSeeker.cs index 667e7c797..f9bc1baf6 100644 --- a/Scripts/Items/Minor Artifacts/ML/SoulSeeker.cs +++ b/Scripts/Items/Minor Artifacts/ML/SoulSeeker.cs @@ -6,10 +6,10 @@ namespace Server.Items { public class SoulSeeker : RadiantScimitar { - public override int LabelNumber{ get{ return 1075046; } } // Soul Seeker + public override int LabelNumber => 1075046; // Soul Seeker - public override int InitMinHits{ get{ return 255; } } - public override int InitMaxHits{ get{ return 255; } } + public override int InitMinHits => 255; + public override int InitMaxHits => 255; [Constructible] public SoulSeeker() @@ -48,4 +48,4 @@ namespace Server.Items int version = reader.ReadEncodedInt(); } } -} \ No newline at end of file +} diff --git a/Scripts/Items/Minor Artifacts/ML/TalonBite.cs b/Scripts/Items/Minor Artifacts/ML/TalonBite.cs index be4f9d51e..7aec78883 100644 --- a/Scripts/Items/Minor Artifacts/ML/TalonBite.cs +++ b/Scripts/Items/Minor Artifacts/ML/TalonBite.cs @@ -6,10 +6,10 @@ namespace Server.Items { public class TalonBite : OrnateAxe { - public override int LabelNumber{ get{ return 1075029; } } // Talon Bite + public override int LabelNumber => 1075029; // Talon Bite - public override int InitMinHits{ get{ return 255; } } - public override int InitMaxHits{ get{ return 255; } } + public override int InitMinHits => 255; + public override int InitMaxHits => 255; [Constructible] public TalonBite() @@ -45,4 +45,4 @@ namespace Server.Items int version = reader.ReadEncodedInt(); } } -} \ No newline at end of file +} diff --git a/Scripts/Items/Minor Artifacts/ML/TotemOfVoid.cs b/Scripts/Items/Minor Artifacts/ML/TotemOfVoid.cs index 4687e5218..ef665cdc7 100644 --- a/Scripts/Items/Minor Artifacts/ML/TotemOfVoid.cs +++ b/Scripts/Items/Minor Artifacts/ML/TotemOfVoid.cs @@ -6,7 +6,7 @@ namespace Server.Items { public class TotemOfVoid : BaseTalisman { - public override int LabelNumber{ get{ return 1075035; } } // Totem of the Void + public override int LabelNumber => 1075035; // Totem of the Void public override bool ForceShowName => true; [Constructible] diff --git a/Scripts/Items/Minor Artifacts/ML/WildfireBow.cs b/Scripts/Items/Minor Artifacts/ML/WildfireBow.cs index e3433678d..681eb3c6e 100644 --- a/Scripts/Items/Minor Artifacts/ML/WildfireBow.cs +++ b/Scripts/Items/Minor Artifacts/ML/WildfireBow.cs @@ -5,20 +5,20 @@ namespace Server.Items { public class WildfireBow : ElvenCompositeLongbow { - public override int LabelNumber{ get{ return 1075044; } } // Wildfire Bow + public override int LabelNumber => 1075044; // Wildfire Bow - public override int InitMinHits{ get{ return 255; } } - public override int InitMaxHits{ get{ return 255; } } + public override int InitMinHits => 255; + public override int InitMaxHits => 255; [Constructible] - public WildfireBow() : base() + public WildfireBow() { Hue = 0x489; - + SkillBonuses.SetValues( 0, SkillName.Archery, 10 ); WeaponAttributes.ResistFireBonus = 25; - - Velocity = 15; + + Velocity = 15; } public override void GetDamageTypes( Mobile wielder, out int phys, out int fire, out int cold, out int pois, out int nrgy, out int chaos, out int direct ) diff --git a/Scripts/Items/Minor Artifacts/ML/Windsong.cs b/Scripts/Items/Minor Artifacts/ML/Windsong.cs index 02abc0ffb..52ff669bc 100644 --- a/Scripts/Items/Minor Artifacts/ML/Windsong.cs +++ b/Scripts/Items/Minor Artifacts/ML/Windsong.cs @@ -5,20 +5,20 @@ namespace Server.Items { public class Windsong : MagicalShortbow { - public override int LabelNumber{ get{ return 1075031; } } // Windsong + public override int LabelNumber => 1075031; // Windsong - public override int InitMinHits{ get{ return 255; } } - public override int InitMaxHits{ get{ return 255; } } + public override int InitMinHits => 255; + public override int InitMaxHits => 255; [Constructible] - public Windsong() : base() + public Windsong() { Hue = 0xF7; - + Attributes.WeaponDamage = 35; WeaponAttributes.SelfRepair = 3; - - Velocity = 25; + + Velocity = 25; } public Windsong( Serial serial ) : base( serial ) diff --git a/Scripts/Items/Minor Artifacts/NightsKiss.cs b/Scripts/Items/Minor Artifacts/NightsKiss.cs index c5c9415a0..5119f1f97 100644 --- a/Scripts/Items/Minor Artifacts/NightsKiss.cs +++ b/Scripts/Items/Minor Artifacts/NightsKiss.cs @@ -5,10 +5,10 @@ namespace Server.Items { public class NightsKiss : Dagger { - public override int LabelNumber{ get{ return 1063475; } } + public override int LabelNumber => 1063475; - public override int InitMinHits{ get{ return 255; } } - public override int InitMaxHits{ get{ return 255; } } + public override int InitMinHits => 255; + public override int InitMaxHits => 255; [Constructible] public NightsKiss() @@ -31,7 +31,7 @@ namespace Server.Items writer.Write( (int) 0 ); } - + public override void Deserialize(GenericReader reader) { base.Deserialize( reader ); @@ -39,4 +39,4 @@ namespace Server.Items int version = reader.ReadInt(); } } -} \ No newline at end of file +} diff --git a/Scripts/Items/Minor Artifacts/NoxRangersHeavyCrossbow.cs b/Scripts/Items/Minor Artifacts/NoxRangersHeavyCrossbow.cs index b9821b54c..95def48dd 100644 --- a/Scripts/Items/Minor Artifacts/NoxRangersHeavyCrossbow.cs +++ b/Scripts/Items/Minor Artifacts/NoxRangersHeavyCrossbow.cs @@ -5,10 +5,10 @@ namespace Server.Items { public class NoxRangersHeavyCrossbow : HeavyCrossbow { - public override int LabelNumber{ get{ return 1063485; } } + public override int LabelNumber => 1063485; - public override int InitMinHits{ get{ return 255; } } - public override int InitMaxHits{ get{ return 255; } } + public override int InitMinHits => 255; + public override int InitMaxHits => 255; [Constructible] public NoxRangersHeavyCrossbow() @@ -39,7 +39,7 @@ namespace Server.Items writer.Write( (int) 0 ); } - + public override void Deserialize(GenericReader reader) { base.Deserialize( reader ); @@ -47,4 +47,4 @@ namespace Server.Items int version = reader.ReadInt(); } } -} \ No newline at end of file +} diff --git a/Scripts/Items/Minor Artifacts/OrcishVisage.cs b/Scripts/Items/Minor Artifacts/OrcishVisage.cs index 9e4dd4214..0a2f5130b 100644 --- a/Scripts/Items/Minor Artifacts/OrcishVisage.cs +++ b/Scripts/Items/Minor Artifacts/OrcishVisage.cs @@ -5,16 +5,16 @@ namespace Server.Items { public class OrcishVisage : OrcHelm { - public override int LabelNumber{ get{ return 1070691; } } + public override int LabelNumber => 1070691; - public override int BasePhysicalResistance{ get{ return 8; } } - public override int BaseFireResistance{ get{ return 5; } } - public override int BaseColdResistance{ get{ return 3; } } - public override int BasePoisonResistance{ get{ return 3; } } - public override int BaseEnergyResistance{ get{ return 5; } } + public override int BasePhysicalResistance => 8; + public override int BaseFireResistance => 5; + public override int BaseColdResistance => 3; + public override int BasePoisonResistance => 3; + public override int BaseEnergyResistance => 5; - public override int InitMinHits{ get{ return 255; } } - public override int InitMaxHits{ get{ return 255; } } + public override int InitMinHits => 255; + public override int InitMaxHits => 255; [Constructible] public OrcishVisage() @@ -35,7 +35,7 @@ namespace Server.Items writer.Write( (int) 0 ); } - + public override void Deserialize(GenericReader reader) { base.Deserialize( reader ); @@ -43,4 +43,4 @@ namespace Server.Items int version = reader.ReadInt(); } } -} \ No newline at end of file +} diff --git a/Scripts/Items/Minor Artifacts/PixieSwatter.cs b/Scripts/Items/Minor Artifacts/PixieSwatter.cs index 66718803e..3256b4bfb 100644 --- a/Scripts/Items/Minor Artifacts/PixieSwatter.cs +++ b/Scripts/Items/Minor Artifacts/PixieSwatter.cs @@ -5,10 +5,10 @@ namespace Server.Items { public class PixieSwatter : Scepter { - public override int LabelNumber{ get{ return 1070854; } } // Pixie Swatter + public override int LabelNumber => 1070854; // Pixie Swatter - public override int InitMinHits{ get{ return 255; } } - public override int InitMaxHits{ get{ return 255; } } + public override int InitMinHits => 255; + public override int InitMaxHits => 255; [Constructible] public PixieSwatter() @@ -16,7 +16,7 @@ namespace Server.Items Hue = 0x8A; WeaponAttributes.HitPoisonArea = 75; Attributes.WeaponSpeed = 30; - + WeaponAttributes.UseBestSkill = 1; WeaponAttributes.ResistFireBonus = 12; WeaponAttributes.ResistEnergyBonus = 12; @@ -41,7 +41,7 @@ namespace Server.Items writer.Write( (int) 0 ); } - + public override void Deserialize(GenericReader reader) { base.Deserialize( reader ); @@ -49,4 +49,4 @@ namespace Server.Items int version = reader.ReadInt(); } } -} \ No newline at end of file +} diff --git a/Scripts/Items/Minor Artifacts/PolarBearMask.cs b/Scripts/Items/Minor Artifacts/PolarBearMask.cs index 3b4aecf83..eddfff601 100644 --- a/Scripts/Items/Minor Artifacts/PolarBearMask.cs +++ b/Scripts/Items/Minor Artifacts/PolarBearMask.cs @@ -5,13 +5,13 @@ namespace Server.Items { public class PolarBearMask : BearMask { - public override int LabelNumber{ get{ return 1070637; } } + public override int LabelNumber => 1070637; - public override int BasePhysicalResistance{ get{ return 15; } } - public override int BaseColdResistance{ get{ return 21; } } + public override int BasePhysicalResistance => 15; + public override int BaseColdResistance => 21; - public override int InitMinHits{ get{ return 255; } } - public override int InitMaxHits{ get{ return 255; } } + public override int InitMinHits => 255; + public override int InitMaxHits => 255; [Constructible] public PolarBearMask() @@ -27,14 +27,14 @@ namespace Server.Items public PolarBearMask( Serial serial ) : base( serial ) { } - + public override void Serialize( GenericWriter writer ) { base.Serialize( writer ); writer.Write( (int) 2 ); } - + public override void Deserialize(GenericReader reader) { base.Deserialize( reader ); @@ -51,4 +51,4 @@ namespace Server.Items Attributes.NightSight = 1; } } -} \ No newline at end of file +} diff --git a/Scripts/Items/Minor Artifacts/ShieldOfInvulnerability.cs b/Scripts/Items/Minor Artifacts/ShieldOfInvulnerability.cs index 62bb837be..7e3448d62 100644 --- a/Scripts/Items/Minor Artifacts/ShieldOfInvulnerability.cs +++ b/Scripts/Items/Minor Artifacts/ShieldOfInvulnerability.cs @@ -5,16 +5,16 @@ namespace Server.Items { public class ShieldOfInvulnerability : OrderShield { - public override int LabelNumber{ get{ return 1070693; } } + public override int LabelNumber => 1070693; - public override int BasePhysicalResistance{ get{ return 8; } } - public override int BaseFireResistance{ get{ return 0; } } - public override int BaseColdResistance{ get{ return 0; } } - public override int BasePoisonResistance{ get{ return 0; } } - public override int BaseEnergyResistance{ get{ return 0; } } + public override int BasePhysicalResistance => 8; + public override int BaseFireResistance => 0; + public override int BaseColdResistance => 0; + public override int BasePoisonResistance => 0; + public override int BaseEnergyResistance => 0; - public override int InitMinHits{ get{ return 255; } } - public override int InitMaxHits{ get{ return 255; } } + public override int InitMinHits => 255; + public override int InitMaxHits => 255; [Constructible] public ShieldOfInvulnerability() @@ -50,4 +50,4 @@ namespace Server.Items int version = reader.ReadInt(); } } -} \ No newline at end of file +} diff --git a/Scripts/Items/Minor Artifacts/ShipModelOfTheHMSCape.cs b/Scripts/Items/Minor Artifacts/ShipModelOfTheHMSCape.cs index b2cd9d95a..63713f3e8 100644 --- a/Scripts/Items/Minor Artifacts/ShipModelOfTheHMSCape.cs +++ b/Scripts/Items/Minor Artifacts/ShipModelOfTheHMSCape.cs @@ -5,8 +5,8 @@ namespace Server.Items { public class ShipModelOfTheHMSCape : Item { - public override int LabelNumber{ get{ return 1063476; } } - + public override int LabelNumber => 1063476; + [Constructible] public ShipModelOfTheHMSCape() : base( 0x14F3 ) { @@ -23,7 +23,7 @@ namespace Server.Items writer.Write( (int) 0 ); } - + public override void Deserialize(GenericReader reader) { base.Deserialize( reader ); @@ -31,4 +31,4 @@ namespace Server.Items int version = reader.ReadInt(); } } -} \ No newline at end of file +} diff --git a/Scripts/Items/Minor Artifacts/StaffOfPower.cs b/Scripts/Items/Minor Artifacts/StaffOfPower.cs index 4dbae62a7..368b4896f 100644 --- a/Scripts/Items/Minor Artifacts/StaffOfPower.cs +++ b/Scripts/Items/Minor Artifacts/StaffOfPower.cs @@ -5,10 +5,10 @@ namespace Server.Items { public class StaffOfPower : BlackStaff { - public override int LabelNumber{ get{ return 1070692; } } + public override int LabelNumber => 1070692; - public override int InitMinHits{ get{ return 255; } } - public override int InitMaxHits{ get{ return 255; } } + public override int InitMinHits => 255; + public override int InitMaxHits => 255; [Constructible] public StaffOfPower() @@ -31,7 +31,7 @@ namespace Server.Items writer.Write( (int) 0 ); } - + public override void Deserialize(GenericReader reader) { base.Deserialize( reader ); @@ -39,4 +39,4 @@ namespace Server.Items int version = reader.ReadInt(); } } -} \ No newline at end of file +} diff --git a/Scripts/Items/Minor Artifacts/VioletCourage.cs b/Scripts/Items/Minor Artifacts/VioletCourage.cs index a274797b7..bd5a263e7 100644 --- a/Scripts/Items/Minor Artifacts/VioletCourage.cs +++ b/Scripts/Items/Minor Artifacts/VioletCourage.cs @@ -5,16 +5,16 @@ namespace Server.Items { public class VioletCourage : FemalePlateChest { - public override int LabelNumber{ get{ return 1063471; } } + public override int LabelNumber => 1063471; - public override int BasePhysicalResistance{ get{ return 14; } } - public override int BaseFireResistance{ get{ return 12; } } - public override int BaseColdResistance{ get{ return 12; } } - public override int BasePoisonResistance{ get{ return 8; } } - public override int BaseEnergyResistance{ get{ return 9; } } + public override int BasePhysicalResistance => 14; + public override int BaseFireResistance => 12; + public override int BaseColdResistance => 12; + public override int BasePoisonResistance => 8; + public override int BaseEnergyResistance => 9; - public override int InitMinHits{ get{ return 255; } } - public override int InitMaxHits{ get{ return 255; } } + public override int InitMinHits => 255; + public override int InitMaxHits => 255; [Constructible] public VioletCourage() @@ -36,7 +36,7 @@ namespace Server.Items writer.Write( (int) 0 ); } - + public override void Deserialize(GenericReader reader) { base.Deserialize( reader ); @@ -44,4 +44,4 @@ namespace Server.Items int version = reader.ReadInt(); } } -} \ No newline at end of file +} diff --git a/Scripts/Items/Minor Artifacts/WrathOfTheDryad.cs b/Scripts/Items/Minor Artifacts/WrathOfTheDryad.cs index c6684da18..a9ec25f2c 100644 --- a/Scripts/Items/Minor Artifacts/WrathOfTheDryad.cs +++ b/Scripts/Items/Minor Artifacts/WrathOfTheDryad.cs @@ -5,10 +5,10 @@ namespace Server.Items { public class WrathOfTheDryad : GnarledStaff { - public override int LabelNumber{ get{ return 1070853; } } // Wrath of the Dryad + public override int LabelNumber => 1070853; // Wrath of the Dryad - public override int InitMinHits{ get{ return 255; } } - public override int InitMaxHits{ get{ return 255; } } + public override int InitMinHits => 255; + public override int InitMaxHits => 255; [Constructible] public WrathOfTheDryad() @@ -37,7 +37,7 @@ namespace Server.Items writer.Write( (int) 0 ); } - + public override void Deserialize(GenericReader reader) { base.Deserialize( reader ); @@ -45,4 +45,4 @@ namespace Server.Items int version = reader.ReadInt(); } } -} \ No newline at end of file +} diff --git a/Scripts/Items/Misc/AcidSlime.cs b/Scripts/Items/Misc/AcidSlime.cs index f512f9889..172289e68 100644 --- a/Scripts/Items/Misc/AcidSlime.cs +++ b/Scripts/Items/Misc/AcidSlime.cs @@ -21,7 +21,7 @@ namespace Server.Items { } - public override string DefaultName { get { return "slime"; } } + public override string DefaultName => "slime"; [Constructible] public AcidSlime( TimeSpan duration, int minDamage, int maxDamage ) diff --git a/Scripts/Items/Misc/BankCheck.cs b/Scripts/Items/Misc/BankCheck.cs index c3d436381..30901aad3 100644 --- a/Scripts/Items/Misc/BankCheck.cs +++ b/Scripts/Items/Misc/BankCheck.cs @@ -64,7 +64,7 @@ namespace Server.Items public override bool DisplayLootType => Core.AOS; - public override int LabelNumber{ get{ return 1041361; } } // A bank check + public override int LabelNumber => 1041361; // A bank check public override void GetProperties( ObjectPropertyList list ) { diff --git a/Scripts/Items/Misc/Bedlam/GlobOfMonstreousInterredGrizzle.cs b/Scripts/Items/Misc/Bedlam/GlobOfMonstreousInterredGrizzle.cs index 272930a6d..176c74065 100644 --- a/Scripts/Items/Misc/Bedlam/GlobOfMonstreousInterredGrizzle.cs +++ b/Scripts/Items/Misc/Bedlam/GlobOfMonstreousInterredGrizzle.cs @@ -5,7 +5,7 @@ namespace Server.Items { public class GlobOfMonstreousInterredGrizzle : Item { - public override int LabelNumber{ get{ return 1072117; } } // Glob of Monsterous Interred Grizzle + public override int LabelNumber => 1072117; // Glob of Monsterous Interred Grizzle [Constructible] public GlobOfMonstreousInterredGrizzle() : base( 0x2F3 ) diff --git a/Scripts/Items/Misc/Bedlam/GrizzledSkullCollection.cs b/Scripts/Items/Misc/Bedlam/GrizzledSkullCollection.cs index 13b580dda..213cc4d44 100644 --- a/Scripts/Items/Misc/Bedlam/GrizzledSkullCollection.cs +++ b/Scripts/Items/Misc/Bedlam/GrizzledSkullCollection.cs @@ -5,7 +5,7 @@ namespace Server.Items { public class GrizzledSkullCollection : Item { - public override int LabelNumber{ get{ return 1072116; } } // Grizzled Skull collection + public override int LabelNumber => 1072116; // Grizzled Skull collection [Constructible] public GrizzledSkullCollection() : base( 0x21FC ) diff --git a/Scripts/Items/Misc/Bedlam/MonsterousInterredGrizzleMaggots.cs b/Scripts/Items/Misc/Bedlam/MonsterousInterredGrizzleMaggots.cs index 23716acbc..b7905e33e 100644 --- a/Scripts/Items/Misc/Bedlam/MonsterousInterredGrizzleMaggots.cs +++ b/Scripts/Items/Misc/Bedlam/MonsterousInterredGrizzleMaggots.cs @@ -5,7 +5,7 @@ namespace Server.Items { public class MonsterousInterredGrizzleMaggots : Item { - public override int LabelNumber{ get{ return 1075090; } } // Monsterous Interred Grizzle Maggots + public override int LabelNumber => 1075090; // Monsterous Interred Grizzle Maggots [Constructible] public MonsterousInterredGrizzleMaggots() : base( 0x2633 ) diff --git a/Scripts/Items/Misc/Bedlam/ResolvesBridle.cs b/Scripts/Items/Misc/Bedlam/ResolvesBridle.cs index 3fcbdeddd..3eb4cd5ae 100644 --- a/Scripts/Items/Misc/Bedlam/ResolvesBridle.cs +++ b/Scripts/Items/Misc/Bedlam/ResolvesBridle.cs @@ -5,7 +5,7 @@ namespace Server.Items { public class ResolvesBridle : Item { - public override int LabelNumber{ get{ return 1074761; } } // Resolve's Bridle + public override int LabelNumber => 1074761; // Resolve's Bridle [Constructible] public ResolvesBridle() : base( 0x1374 ) diff --git a/Scripts/Items/Misc/Bedlam/TombstoneOfTheDamned.cs b/Scripts/Items/Misc/Bedlam/TombstoneOfTheDamned.cs index ff1304832..c0b45e306 100644 --- a/Scripts/Items/Misc/Bedlam/TombstoneOfTheDamned.cs +++ b/Scripts/Items/Misc/Bedlam/TombstoneOfTheDamned.cs @@ -5,7 +5,7 @@ namespace Server.Items { public class TombstoneOfTheDamned : Item { - public override int LabelNumber{ get{ return 1072123; } } // Tombstone of the Damned + public override int LabelNumber => 1072123; // Tombstone of the Damned [Constructible] public TombstoneOfTheDamned() : base( Utility.RandomMinMax( 0xED7, 0xEDE ) ) diff --git a/Scripts/Items/Misc/Blighted Grove/AbscessTail.cs b/Scripts/Items/Misc/Blighted Grove/AbscessTail.cs index fddc612fe..affd81fd1 100644 --- a/Scripts/Items/Misc/Blighted Grove/AbscessTail.cs +++ b/Scripts/Items/Misc/Blighted Grove/AbscessTail.cs @@ -5,7 +5,7 @@ namespace Server.Items { public class AbscessTail : Item { - public override int LabelNumber{ get{ return 1074231; } } // Abscess' Tail + public override int LabelNumber => 1074231; // Abscess' Tail [Constructible] public AbscessTail() : base( 0x1A9D ) diff --git a/Scripts/Items/Misc/Blighted Grove/CoilsFang.cs b/Scripts/Items/Misc/Blighted Grove/CoilsFang.cs index 34c74e40c..865c19c37 100644 --- a/Scripts/Items/Misc/Blighted Grove/CoilsFang.cs +++ b/Scripts/Items/Misc/Blighted Grove/CoilsFang.cs @@ -5,7 +5,7 @@ namespace Server.Items { public class CoilsFang : Item { - public override int LabelNumber{ get{ return 1074229; } } // Coil's Fang + public override int LabelNumber => 1074229; // Coil's Fang [Constructible] public CoilsFang() : base( 0x10E8 ) diff --git a/Scripts/Items/Misc/Blighted Grove/EternallyCorruptTree.cs b/Scripts/Items/Misc/Blighted Grove/EternallyCorruptTree.cs index 6cc8ceb99..023e1910e 100644 --- a/Scripts/Items/Misc/Blighted Grove/EternallyCorruptTree.cs +++ b/Scripts/Items/Misc/Blighted Grove/EternallyCorruptTree.cs @@ -5,7 +5,7 @@ namespace Server.Items { public class EternallyCorruptTree : Item { - public override int LabelNumber{ get{ return 1072093; } } // Eternally Corrupt Tree + public override int LabelNumber => 1072093; // Eternally Corrupt Tree [Constructible] public EternallyCorruptTree() : base( 0x20FA ) diff --git a/Scripts/Items/Misc/Blighted Grove/HydraScale.cs b/Scripts/Items/Misc/Blighted Grove/HydraScale.cs index 5884c169c..79fe97169 100644 --- a/Scripts/Items/Misc/Blighted Grove/HydraScale.cs +++ b/Scripts/Items/Misc/Blighted Grove/HydraScale.cs @@ -5,7 +5,7 @@ namespace Server.Items { public class HydraScale : Item { - public override int LabelNumber{ get{ return 1074760; } } // A hydra scale. + public override int LabelNumber => 1074760; // A hydra scale. [Constructible] public HydraScale() : base( 0x26B4 ) diff --git a/Scripts/Items/Misc/Blighted Grove/MelisandesFermentedWine.cs b/Scripts/Items/Misc/Blighted Grove/MelisandesFermentedWine.cs index 33b0afeca..54a344f6e 100644 --- a/Scripts/Items/Misc/Blighted Grove/MelisandesFermentedWine.cs +++ b/Scripts/Items/Misc/Blighted Grove/MelisandesFermentedWine.cs @@ -5,7 +5,7 @@ namespace Server.Items { public class MelisandesFermentedWine : GreaterExplosionPotion { - public override int LabelNumber{ get{ return 1072114; } } // Melisande's Fermented Wine + public override int LabelNumber => 1072114; // Melisande's Fermented Wine [Constructible] public MelisandesFermentedWine() diff --git a/Scripts/Items/Misc/Blighted Grove/MelisandesHairDye.cs b/Scripts/Items/Misc/Blighted Grove/MelisandesHairDye.cs index 698b007fb..f2935f574 100644 --- a/Scripts/Items/Misc/Blighted Grove/MelisandesHairDye.cs +++ b/Scripts/Items/Misc/Blighted Grove/MelisandesHairDye.cs @@ -6,7 +6,7 @@ namespace Server.Items { public class MelisandesHairDye : Item { - public override int LabelNumber{ get{ return 1041088; } } // Hair Dye + public override int LabelNumber => 1041088; // Hair Dye [Constructible] public MelisandesHairDye() : base( 0xEFF ) @@ -52,12 +52,12 @@ namespace Server.Items private class ConfirmGump : BaseConfirmGump { - public override int TitleNumber{ get{ return 1074395; } } //
Use Permanent Hair Dye
- public override int LabelNumber{ get{ return 1074396; } } // This special hair dye is made of a unique mixture of leaves, permanently changing one's hair color until another dye is used. + public override int TitleNumber => 1074395; //
Use Permanent Hair Dye
+ public override int LabelNumber => 1074396; // This special hair dye is made of a unique mixture of leaves, permanently changing one's hair color until another dye is used. private Item m_Item; - public ConfirmGump( Item item ) : base() + public ConfirmGump( Item item ) { m_Item = item; } diff --git a/Scripts/Items/Misc/Blighted Grove/SalivasFeather.cs b/Scripts/Items/Misc/Blighted Grove/SalivasFeather.cs index 78b086dc4..542c9c7b0 100644 --- a/Scripts/Items/Misc/Blighted Grove/SalivasFeather.cs +++ b/Scripts/Items/Misc/Blighted Grove/SalivasFeather.cs @@ -5,7 +5,7 @@ namespace Server.Items { public class SalivasFeather : Item { - public override int LabelNumber{ get{ return 1074234; } } // Saliva's Feather + public override int LabelNumber => 1074234; // Saliva's Feather [Constructible] public SalivasFeather() : base( 0x1020 ) diff --git a/Scripts/Items/Misc/Blighted Grove/SamplesOfCorruptedWater.cs b/Scripts/Items/Misc/Blighted Grove/SamplesOfCorruptedWater.cs index b79c93619..b0fb0147b 100644 --- a/Scripts/Items/Misc/Blighted Grove/SamplesOfCorruptedWater.cs +++ b/Scripts/Items/Misc/Blighted Grove/SamplesOfCorruptedWater.cs @@ -5,7 +5,7 @@ namespace Server.Items { public class SamplesOfCorruptedWater : Item { - public override int LabelNumber{ get{ return 1074999; } } // samples of corrupted water + public override int LabelNumber => 1074999; // samples of corrupted water [Constructible] public SamplesOfCorruptedWater() : base( 0xEFE ) diff --git a/Scripts/Items/Misc/Blighted Grove/TaintedSeeds.cs b/Scripts/Items/Misc/Blighted Grove/TaintedSeeds.cs index 1cc688bb9..db558f566 100644 --- a/Scripts/Items/Misc/Blighted Grove/TaintedSeeds.cs +++ b/Scripts/Items/Misc/Blighted Grove/TaintedSeeds.cs @@ -5,7 +5,7 @@ namespace Server.Items { public class TaintedSeeds : Item { - public override int LabelNumber{ get{ return 1074233; } } // Tainted Seeds + public override int LabelNumber => 1074233; // Tainted Seeds [Constructible] public TaintedSeeds() : base( 0xDFA ) diff --git a/Scripts/Items/Misc/Blighted Grove/ThorvaldsMedallion.cs b/Scripts/Items/Misc/Blighted Grove/ThorvaldsMedallion.cs index 697a8bcb7..ac1a12380 100644 --- a/Scripts/Items/Misc/Blighted Grove/ThorvaldsMedallion.cs +++ b/Scripts/Items/Misc/Blighted Grove/ThorvaldsMedallion.cs @@ -5,7 +5,7 @@ namespace Server.Items { public class ThorvaldsMedallion : Item { - public override int LabelNumber{ get{ return 1074232; } } // Thorvald's Medallion + public override int LabelNumber => 1074232; // Thorvald's Medallion [Constructible] public ThorvaldsMedallion() : base( 0x2AAA ) diff --git a/Scripts/Items/Misc/Blighted Grove/ThrashersTail.cs b/Scripts/Items/Misc/Blighted Grove/ThrashersTail.cs index bc93caf68..81e6bf062 100644 --- a/Scripts/Items/Misc/Blighted Grove/ThrashersTail.cs +++ b/Scripts/Items/Misc/Blighted Grove/ThrashersTail.cs @@ -5,7 +5,7 @@ namespace Server.Items { public class ThrashersTail : Item { - public override int LabelNumber{ get{ return 1074230; } } // Thrasher's Tail + public override int LabelNumber => 1074230; // Thrasher's Tail [Constructible] public ThrashersTail() : base( 0x1A9D ) diff --git a/Scripts/Items/Misc/Blocker.cs b/Scripts/Items/Misc/Blocker.cs index 97cf879d9..6f715f52f 100644 --- a/Scripts/Items/Misc/Blocker.cs +++ b/Scripts/Items/Misc/Blocker.cs @@ -6,7 +6,7 @@ namespace Server.Items { public class Blocker : Item { - public override int LabelNumber{ get{ return 503057; } } // Impassable! + public override int LabelNumber => 503057; // Impassable! [Constructible] public Blocker() : base( 0x21A4 ) @@ -103,4 +103,4 @@ namespace Server.Items } } } -} \ No newline at end of file +} diff --git a/Scripts/Items/Misc/CommunicationCrystals.cs b/Scripts/Items/Misc/CommunicationCrystals.cs index 76bfb3940..7e970e68f 100644 --- a/Scripts/Items/Misc/CommunicationCrystals.cs +++ b/Scripts/Items/Misc/CommunicationCrystals.cs @@ -49,7 +49,7 @@ namespace Server.Items { public static readonly int MaxCharges = 2000; - public override int LabelNumber{ get{ return 1060740; } } // communication crystal + public override int LabelNumber => 1060740; // communication crystal private int m_Charges; private List m_Receivers; @@ -303,7 +303,7 @@ namespace Server.Items public class ReceiverCrystal : Item { - public override int LabelNumber{ get{ return 1060740; } } // communication crystal + public override int LabelNumber => 1060740; // communication crystal private BroadcastCrystal m_Sender; @@ -481,4 +481,4 @@ namespace Server.Items m_Sender = reader.ReadItem(); } } -} \ No newline at end of file +} diff --git a/Scripts/Items/Misc/Corpses/Corpse.cs b/Scripts/Items/Misc/Corpses/Corpse.cs index c1857585e..4b59f6d4f 100644 --- a/Scripts/Items/Misc/Corpses/Corpse.cs +++ b/Scripts/Items/Misc/Corpses/Corpse.cs @@ -148,9 +148,7 @@ namespace Server.Items if ( m_InstancedItems != null ) { - InstancedItemInfo info; - - if ( m_InstancedItems.TryGetValue( child, out info ) && (InstancedCorpse || info.Perpetual) ) + if ( m_InstancedItems.TryGetValue( child, out InstancedItemInfo info ) && (InstancedCorpse || info.Perpetual) ) { return info.IsOwner( m ); //IsOwner checks Party stuff. } @@ -267,8 +265,8 @@ namespace Server.Items public override bool DisplayWeight => false; - public HairInfo Hair { get { return m_Hair; } } - public FacialHairInfo FacialHair { get { return m_FacialHair; } } + public HairInfo Hair => m_Hair; + public FacialHairInfo FacialHair => m_FacialHair; [CommandProperty( AccessLevel.GameMaster )] public bool IsBones diff --git a/Scripts/Items/Misc/DeceitBrazier.cs b/Scripts/Items/Misc/DeceitBrazier.cs index fea8514dc..53edabd44 100644 --- a/Scripts/Items/Misc/DeceitBrazier.cs +++ b/Scripts/Items/Misc/DeceitBrazier.cs @@ -68,7 +68,7 @@ namespace Server.Items #endregion }; - public static Type[] Creatures { get { return m_Creatures; } } + public static Type[] Creatures => m_Creatures; private Timer m_Timer; private DateTime m_NextSpawn; @@ -76,7 +76,7 @@ namespace Server.Items private TimeSpan m_NextSpawnDelay; [CommandProperty( AccessLevel.GameMaster )] - public DateTime NextSpawn { get { return m_NextSpawn; } } + public DateTime NextSpawn => m_NextSpawn; [CommandProperty( AccessLevel.GameMaster )] public int SpawnRange { get { return m_SpawnRange; } set { m_SpawnRange = value; } } @@ -84,7 +84,7 @@ namespace Server.Items [CommandProperty( AccessLevel.GameMaster )] public TimeSpan NextSpawnDelay { get { return m_NextSpawnDelay; } set { m_NextSpawnDelay = value; } } - public override int LabelNumber { get { return 1023633; } } // Brazier + public override int LabelNumber => 1023633; // Brazier [Constructible] public DeceitBrazier() : base( 0xE31 ) diff --git a/Scripts/Items/Misc/HairDye.cs b/Scripts/Items/Misc/HairDye.cs index 5ab2b4dd8..3cd725446 100644 --- a/Scripts/Items/Misc/HairDye.cs +++ b/Scripts/Items/Misc/HairDye.cs @@ -7,7 +7,7 @@ namespace Server.Items { public class HairDye : Item { - public override int LabelNumber{ get{ return 1041060; } } // Hair Dye + public override int LabelNumber => 1041060; // Hair Dye [Constructible] public HairDye() : base( 0xEFF ) @@ -18,7 +18,7 @@ namespace Server.Items public HairDye( Serial serial ) : base( serial ) { } - + public override void Serialize( GenericWriter writer ) { base.Serialize( writer ); @@ -43,7 +43,7 @@ namespace Server.Items else { from.LocalOverheadMessage( MessageType.Regular, 906, 1019045 ); // I can't reach that. - } + } } } @@ -147,7 +147,7 @@ namespace Server.Items Mobile m = from.Mobile; int[] switches = info.Switches; - if ( !m_HairDye.IsChildOf( m.Backpack ) ) + if ( !m_HairDye.IsChildOf( m.Backpack ) ) { m.SendLocalizedMessage( 1042010 ); //You must have the objectin your backpack to use it. return; @@ -190,4 +190,4 @@ namespace Server.Items } } } -} \ No newline at end of file +} diff --git a/Scripts/Items/Misc/HoveringWisp.cs b/Scripts/Items/Misc/HoveringWisp.cs index cb100b549..eaa436037 100644 --- a/Scripts/Items/Misc/HoveringWisp.cs +++ b/Scripts/Items/Misc/HoveringWisp.cs @@ -5,7 +5,7 @@ namespace Server.Items { public class HoveringWisp : Item { - public override int LabelNumber{ get{ return 1072881; } } // hovering wisp + public override int LabelNumber => 1072881; // hovering wisp [Constructible] public HoveringWisp() : base( 0x2100 ) diff --git a/Scripts/Items/Misc/InteriorDecorator.cs b/Scripts/Items/Misc/InteriorDecorator.cs index 199452e31..a65dc750b 100644 --- a/Scripts/Items/Misc/InteriorDecorator.cs +++ b/Scripts/Items/Misc/InteriorDecorator.cs @@ -30,7 +30,7 @@ namespace Server.Items LootType = LootType.Blessed; } - public override int LabelNumber{ get{ return 1041280; } } // an interior decorator + public override int LabelNumber => 1041280; // an interior decorator public InteriorDecorator( Serial serial ) : base( serial ) { @@ -62,7 +62,7 @@ namespace Server.Items { if ( !CheckUse( this, from ) ) return; - + if ( from.FindGump( typeof( InteriorDecorator.InternalGump ) ) == null ) from.SendGump( new InternalGump( this ) ); @@ -154,7 +154,7 @@ namespace Server.Items { BaseHouse house = BaseHouse.FindHouseAt( from ); Item item = (Item)targeted; - + bool isDecorableComponent = false; if ( item is AddonComponent || item is AddonContainerComponent || item is BaseAddonContainer ) @@ -228,10 +228,10 @@ namespace Server.Items } } } - + from.Target = new InternalTarget( m_Decorator ); } - + protected override void OnTargetCancel( Mobile from, TargetCancelType cancelType ) { if ( cancelType == TargetCancelType.Canceled ) @@ -314,4 +314,4 @@ namespace Server.Items } } } -} \ No newline at end of file +} diff --git a/Scripts/Items/Misc/KeyRing.cs b/Scripts/Items/Misc/KeyRing.cs index 2abd4d223..d50bf9873 100644 --- a/Scripts/Items/Misc/KeyRing.cs +++ b/Scripts/Items/Misc/KeyRing.cs @@ -12,7 +12,7 @@ namespace Server.Items private List m_Keys; - public List Keys { get { return m_Keys; } } + public List Keys => m_Keys; [Constructible] public KeyRing() : base( 0x1011 ) @@ -204,4 +204,4 @@ namespace Server.Items m_Keys = reader.ReadStrongItemList(); } } -} \ No newline at end of file +} diff --git a/Scripts/Items/Misc/Labyrinth/MinotaurArtifact.cs b/Scripts/Items/Misc/Labyrinth/MinotaurArtifact.cs index 0ea8cb21d..636636ec5 100644 --- a/Scripts/Items/Misc/Labyrinth/MinotaurArtifact.cs +++ b/Scripts/Items/Misc/Labyrinth/MinotaurArtifact.cs @@ -5,8 +5,8 @@ namespace Server.Items { public class MinotaurArtifact : Item { - public override int LabelNumber{ get{ return 1074826; } } // Minotaur Artifact - public override double DefaultWeight{ get{ return 5.0; } } + public override int LabelNumber => 1074826; // Minotaur Artifact + public override double DefaultWeight => 5.0; [Constructible] public MinotaurArtifact() : base( Utility.RandomList( 0xB46, 0xB48, 0x9ED ) ) diff --git a/Scripts/Items/Misc/Moonstone.cs b/Scripts/Items/Misc/Moonstone.cs index 0edd44086..f4fb2633b 100644 --- a/Scripts/Items/Misc/Moonstone.cs +++ b/Scripts/Items/Misc/Moonstone.cs @@ -28,7 +28,7 @@ namespace Server.Items } } - public override int LabelNumber{ get{ return 1041490 + (int)m_Type; } } + public override int LabelNumber => 1041490 + (int)m_Type; [Constructible] public Moonstone( MoonstoneType type ) : base( 0xF8B ) @@ -200,4 +200,4 @@ namespace Server.Items } } } -} \ No newline at end of file +} diff --git a/Scripts/Items/Misc/OilCloth.cs b/Scripts/Items/Misc/OilCloth.cs index 831c6eae0..c035cc351 100644 --- a/Scripts/Items/Misc/OilCloth.cs +++ b/Scripts/Items/Misc/OilCloth.cs @@ -7,7 +7,7 @@ namespace Server.Items { public class OilCloth : Item, IScissorable, IDyable { - public override int LabelNumber{ get{ return 1041498; } } // oil cloth + public override int LabelNumber => 1041498; // oil cloth public override double DefaultWeight { @@ -151,4 +151,4 @@ namespace Server.Items int version = reader.ReadInt(); } } -} \ No newline at end of file +} diff --git a/Scripts/Items/Misc/Origami.cs b/Scripts/Items/Misc/Origami.cs index 37f0b7aa9..0c692a94e 100644 --- a/Scripts/Items/Misc/Origami.cs +++ b/Scripts/Items/Misc/Origami.cs @@ -6,7 +6,7 @@ namespace Server.Items { public class OrigamiPaper : Item { - public override int LabelNumber{ get{ return 1030288; } } // origami paper + public override int LabelNumber => 1030288; // origami paper [Constructible] public OrigamiPaper() : base( 0x2830 ) @@ -63,7 +63,7 @@ namespace Server.Items public class OrigamiButterfly : Item { - public override int LabelNumber{ get{ return 1030296; } } // a delicate origami butterfly + public override int LabelNumber => 1030296; // a delicate origami butterfly [Constructible] public OrigamiButterfly() : base( 0x2838 ) @@ -92,14 +92,14 @@ namespace Server.Items public class OrigamiSwan : Item { - public override int LabelNumber{ get{ return 1030297; } } // a delicate origami swan + public override int LabelNumber => 1030297; // a delicate origami swan [Constructible] public OrigamiSwan() : base( 0x2839 ) { LootType = LootType.Blessed; - + } public OrigamiSwan( Serial serial ) : base( serial ) @@ -123,14 +123,14 @@ namespace Server.Items public class OrigamiFrog : Item { - public override int LabelNumber{ get{ return 1030298; } } // a delicate origami frog + public override int LabelNumber => 1030298; // a delicate origami frog [Constructible] public OrigamiFrog() : base( 0x283A ) { LootType = LootType.Blessed; - + } public OrigamiFrog( Serial serial ) : base( serial ) @@ -154,14 +154,14 @@ namespace Server.Items public class OrigamiShape : Item { - public override int LabelNumber{ get{ return 1030299; } } // an intricate geometric origami shape + public override int LabelNumber => 1030299; // an intricate geometric origami shape [Constructible] public OrigamiShape() : base( 0x283B ) { LootType = LootType.Blessed; - + } public OrigamiShape( Serial serial ) : base( serial ) @@ -185,14 +185,14 @@ namespace Server.Items public class OrigamiSongbird : Item { - public override int LabelNumber{ get{ return 1030300; } } // a delicate origami songbird + public override int LabelNumber => 1030300; // a delicate origami songbird [Constructible] public OrigamiSongbird() : base( 0x283C ) { LootType = LootType.Blessed; - + } public OrigamiSongbird( Serial serial ) : base( serial ) @@ -216,14 +216,14 @@ namespace Server.Items public class OrigamiFish : Item { - public override int LabelNumber{ get{ return 1030301; } } // a delicate origami fish + public override int LabelNumber => 1030301; // a delicate origami fish [Constructible] public OrigamiFish() : base( 0x283D ) { LootType = LootType.Blessed; - + } public OrigamiFish( Serial serial ) : base( serial ) @@ -244,4 +244,4 @@ namespace Server.Items int version = reader.ReadEncodedInt(); } } -} \ No newline at end of file +} diff --git a/Scripts/Items/Misc/Painted Caves/GrobusFur.cs b/Scripts/Items/Misc/Painted Caves/GrobusFur.cs index ee578d2f5..d55de66c1 100644 --- a/Scripts/Items/Misc/Painted Caves/GrobusFur.cs +++ b/Scripts/Items/Misc/Painted Caves/GrobusFur.cs @@ -4,7 +4,7 @@ namespace Server.Items { public class GrobusFur : Item { - public override int LabelNumber{ get{ return 1074676; } } // Grobu's Fur + public override int LabelNumber => 1074676; // Grobu's Fur [Constructible] public GrobusFur() : base( 0x11F4 ) diff --git a/Scripts/Items/Misc/Painted Caves/PrimitiveFetish.cs b/Scripts/Items/Misc/Painted Caves/PrimitiveFetish.cs index 838a3b3be..027c702f8 100644 --- a/Scripts/Items/Misc/Painted Caves/PrimitiveFetish.cs +++ b/Scripts/Items/Misc/Painted Caves/PrimitiveFetish.cs @@ -4,7 +4,7 @@ namespace Server.Items { public class PrimitiveFetish : Item { - public override int LabelNumber{ get{ return 1074675; } } // Primitive Fetish + public override int LabelNumber => 1074675; // Primitive Fetish [Constructible] public PrimitiveFetish() : base( 0x23F ) diff --git a/Scripts/Items/Misc/Palace of Paroxysmus/AcidProofRope.cs b/Scripts/Items/Misc/Palace of Paroxysmus/AcidProofRope.cs index 5a0653bfc..8ba032a0b 100644 --- a/Scripts/Items/Misc/Palace of Paroxysmus/AcidProofRope.cs +++ b/Scripts/Items/Misc/Palace of Paroxysmus/AcidProofRope.cs @@ -5,7 +5,7 @@ namespace Server.Items { public class AcidProofRope : Item { - public override int LabelNumber{ get{ return 1074886; } } // Acid Proof Rope + public override int LabelNumber => 1074886; // Acid Proof Rope [Constructible] public AcidProofRope() : base( 0x20D ) diff --git a/Scripts/Items/Misc/Palace of Paroxysmus/ParoxysmusCorrodedStein.cs b/Scripts/Items/Misc/Palace of Paroxysmus/ParoxysmusCorrodedStein.cs index 82ae8f45e..9af2f02c4 100644 --- a/Scripts/Items/Misc/Palace of Paroxysmus/ParoxysmusCorrodedStein.cs +++ b/Scripts/Items/Misc/Palace of Paroxysmus/ParoxysmusCorrodedStein.cs @@ -5,7 +5,7 @@ namespace Server.Items { public class ParoxysmusCorrodedStein : Item { - public override int LabelNumber{ get{ return 1072083; } } // Paroxysmus' Corroded Stein + public override int LabelNumber => 1072083; // Paroxysmus' Corroded Stein [Constructible] public ParoxysmusCorrodedStein() : base( 0x9D6 ) diff --git a/Scripts/Items/Misc/Palace of Paroxysmus/ParoxysmusDinner.cs b/Scripts/Items/Misc/Palace of Paroxysmus/ParoxysmusDinner.cs index 1945733b7..c06334759 100644 --- a/Scripts/Items/Misc/Palace of Paroxysmus/ParoxysmusDinner.cs +++ b/Scripts/Items/Misc/Palace of Paroxysmus/ParoxysmusDinner.cs @@ -5,7 +5,7 @@ namespace Server.Items { public class ParoxysmusDinner : Item { - public override int LabelNumber{ get{ return 1072086; } } // Paroxysmus' Dinner + public override int LabelNumber => 1072086; // Paroxysmus' Dinner [Constructible] public ParoxysmusDinner() : base( 0x1E95 ) diff --git a/Scripts/Items/Misc/Palace of Paroxysmus/StringOfPartsOfParoxysmusVictims.cs b/Scripts/Items/Misc/Palace of Paroxysmus/StringOfPartsOfParoxysmusVictims.cs index 936243fcb..8483a7b68 100644 --- a/Scripts/Items/Misc/Palace of Paroxysmus/StringOfPartsOfParoxysmusVictims.cs +++ b/Scripts/Items/Misc/Palace of Paroxysmus/StringOfPartsOfParoxysmusVictims.cs @@ -5,7 +5,7 @@ namespace Server.Items { public class StringOfPartsOfParoxysmusVictims : Item { - public override int LabelNumber{ get{ return 1072082; } } // String of Parts of Paroxysmus' Victims + public override int LabelNumber => 1072082; // String of Parts of Paroxysmus' Victims [Constructible] public StringOfPartsOfParoxysmusVictims() : base( 0xFD2 ) diff --git a/Scripts/Items/Misc/Palace of Paroxysmus/SweatOfParoxysmus.cs b/Scripts/Items/Misc/Palace of Paroxysmus/SweatOfParoxysmus.cs index 4c1a4e089..244049812 100644 --- a/Scripts/Items/Misc/Palace of Paroxysmus/SweatOfParoxysmus.cs +++ b/Scripts/Items/Misc/Palace of Paroxysmus/SweatOfParoxysmus.cs @@ -5,7 +5,7 @@ namespace Server.Items { public class SweatOfParoxysmus : Item { - public override int LabelNumber{ get{ return 1072081; } } // Sweat of Paroxysmus + public override int LabelNumber => 1072081; // Sweat of Paroxysmus [Constructible] public SweatOfParoxysmus() : base( 0xF01 ) diff --git a/Scripts/Items/Misc/PlayerBulletinBoards.cs b/Scripts/Items/Misc/PlayerBulletinBoards.cs index 2184455e9..0edc0b7f1 100644 --- a/Scripts/Items/Misc/PlayerBulletinBoards.cs +++ b/Scripts/Items/Misc/PlayerBulletinBoards.cs @@ -13,7 +13,7 @@ namespace Server.Items { public class PlayerBBSouth : BasePlayerBB { - public override int LabelNumber{ get{ return 1062421; } } // bulletin board (south) + public override int LabelNumber => 1062421; // bulletin board (south) [Constructible] public PlayerBBSouth() : base( 0x2311 ) @@ -42,7 +42,7 @@ namespace Server.Items public class PlayerBBEast : BasePlayerBB { - public override int LabelNumber{ get{ return 1062420; } } // bulletin board (east) + public override int LabelNumber => 1062420; // bulletin board (east) [Constructible] public PlayerBBEast() : base( 0x2312 ) @@ -637,4 +637,4 @@ namespace Server.Items } } } -} \ No newline at end of file +} diff --git a/Scripts/Items/Misc/PlayerVendorDeed.cs b/Scripts/Items/Misc/PlayerVendorDeed.cs index c8d900ed9..f272b417c 100644 --- a/Scripts/Items/Misc/PlayerVendorDeed.cs +++ b/Scripts/Items/Misc/PlayerVendorDeed.cs @@ -7,7 +7,7 @@ namespace Server.Items { public class ContractOfEmployment : Item { - public override int LabelNumber{ get{ return 1041243; } } // a contract of employment + public override int LabelNumber => 1041243; // a contract of employment [Constructible] public ContractOfEmployment() : base( 0x14F0 ) @@ -59,7 +59,7 @@ namespace Server.Items if ( house == null ) { - from.SendLocalizedMessage( 503240 ); // Vendors can only be placed in houses. + from.SendLocalizedMessage( 503240 ); // Vendors can only be placed in houses. } else if ( !BaseHouse.NewVendorSystem && !house.IsFriend( from ) ) { @@ -69,7 +69,7 @@ namespace Server.Items { from.SendLocalizedMessage( 1062423 ); // Only the house owner can directly place vendors. Please ask the house owner to offer you a vendor contract so that you may place a vendor in this house. } - else if ( !house.Public || !house.CanPlaceNewVendor() ) + else if ( !house.Public || !house.CanPlaceNewVendor() ) { from.SendLocalizedMessage( 503241 ); // You cannot place this vendor or barkeep. Make sure the house is public and has sufficient storage available. } @@ -101,4 +101,4 @@ namespace Server.Items } } } -} \ No newline at end of file +} diff --git a/Scripts/Items/Misc/PoolOfAcid.cs b/Scripts/Items/Misc/PoolOfAcid.cs index 34192be4d..789543de0 100644 --- a/Scripts/Items/Misc/PoolOfAcid.cs +++ b/Scripts/Items/Misc/PoolOfAcid.cs @@ -21,7 +21,7 @@ namespace Server.Items { } - public override string DefaultName { get { return "a pool of acid"; } } + public override string DefaultName => "a pool of acid"; [Constructible] public PoolOfAcid( TimeSpan duration, int minDamage, int maxDamage ) diff --git a/Scripts/Items/Misc/Prism of Light/CrystallineFragments.cs b/Scripts/Items/Misc/Prism of Light/CrystallineFragments.cs index b590fbc94..2c0bb5b54 100644 --- a/Scripts/Items/Misc/Prism of Light/CrystallineFragments.cs +++ b/Scripts/Items/Misc/Prism of Light/CrystallineFragments.cs @@ -5,7 +5,7 @@ namespace Server.Items { public class CrystallineFragments : Item { - public override int LabelNumber{ get{ return 1073160; } } // Crystalline Fragments + public override int LabelNumber => 1073160; // Crystalline Fragments [Constructible] public CrystallineFragments() : base( 0x223B ) diff --git a/Scripts/Items/Misc/Prism of Light/IcyHeart.cs b/Scripts/Items/Misc/Prism of Light/IcyHeart.cs index 0bd2f58fd..aefa02b60 100644 --- a/Scripts/Items/Misc/Prism of Light/IcyHeart.cs +++ b/Scripts/Items/Misc/Prism of Light/IcyHeart.cs @@ -5,7 +5,7 @@ namespace Server.Items { public class IcyHeart : Item { - public override int LabelNumber{ get{ return 1073162; } } // Icy Heart + public override int LabelNumber => 1073162; // Icy Heart [Constructible] public IcyHeart() : base( 0x24B ) diff --git a/Scripts/Items/Misc/Prism of Light/ProtectorsEssence.cs b/Scripts/Items/Misc/Prism of Light/ProtectorsEssence.cs index de2980a00..4d4f678ad 100644 --- a/Scripts/Items/Misc/Prism of Light/ProtectorsEssence.cs +++ b/Scripts/Items/Misc/Prism of Light/ProtectorsEssence.cs @@ -5,7 +5,7 @@ namespace Server.Items { public class ProtectorsEssence : Item { - public override int LabelNumber{ get{ return 1073159; } } // Protector's Essence + public override int LabelNumber => 1073159; // Protector's Essence [Constructible] public ProtectorsEssence() : base( 0x23F ) diff --git a/Scripts/Items/Misc/Prism of Light/ShimmeringCrystal.cs b/Scripts/Items/Misc/Prism of Light/ShimmeringCrystal.cs index 80de80ffd..856fc221d 100644 --- a/Scripts/Items/Misc/Prism of Light/ShimmeringCrystal.cs +++ b/Scripts/Items/Misc/Prism of Light/ShimmeringCrystal.cs @@ -5,7 +5,7 @@ namespace Server.Items { public class ShimmeringCrystals : Item { - public override int LabelNumber{ get{ return 1075095; } } // Shimmering Crystals + public override int LabelNumber => 1075095; // Shimmering Crystals public override bool ForceShowProperties => true; private static readonly int[] m_ItemIDs = new int[] diff --git a/Scripts/Items/Misc/PromotionalToken.cs b/Scripts/Items/Misc/PromotionalToken.cs index 7e8ad82c0..1e13914f5 100644 --- a/Scripts/Items/Misc/PromotionalToken.cs +++ b/Scripts/Items/Misc/PromotionalToken.cs @@ -71,7 +71,7 @@ namespace Server.Items int version = reader.ReadInt(); } - public override int LabelNumber { get { return 1070997; } } // A promotional token + public override int LabelNumber => 1070997; // A promotional token private class PromotionalTokenGump : Gump @@ -129,12 +129,12 @@ namespace Server.Items return null; } - public override TextDefinition ItemGumpName{ get{ return 1070999; } }//
Soulstone Fragment
- public override TextDefinition ItemName { get { return 1071000; } }//soulstone fragment - public override TextDefinition ItemReceiveMessage{ get{ return 1070976; } } // A soulstone fragment has been created in your bank box. + public override TextDefinition ItemGumpName => 1070999;//
Soulstone Fragment
+ public override TextDefinition ItemName => 1071000;//soulstone fragment + public override TextDefinition ItemReceiveMessage => 1070976; // A soulstone fragment has been created in your bank box. [Constructible] - public SoulstoneFragmentToken() : base() + public SoulstoneFragmentToken() { } diff --git a/Scripts/Items/Misc/SpecialBeardDye.cs b/Scripts/Items/Misc/SpecialBeardDye.cs index 4806352c1..3af6707e3 100644 --- a/Scripts/Items/Misc/SpecialBeardDye.cs +++ b/Scripts/Items/Misc/SpecialBeardDye.cs @@ -7,7 +7,7 @@ namespace Server.Items { public class SpecialBeardDye : Item { - public override int LabelNumber{ get{ return 1041087; } } // Special Beard Dye + public override int LabelNumber => 1041087; // Special Beard Dye [Constructible] public SpecialBeardDye() : base( 0xE26 ) @@ -19,7 +19,7 @@ namespace Server.Items public SpecialBeardDye( Serial serial ) : base( serial ) { } - + public override void Serialize( GenericWriter writer ) { base.Serialize( writer ); @@ -183,4 +183,4 @@ namespace Server.Items } } } -} \ No newline at end of file +} diff --git a/Scripts/Items/Misc/Static.cs b/Scripts/Items/Misc/Static.cs index 8621f0570..aa73280bf 100644 --- a/Scripts/Items/Misc/Static.cs +++ b/Scripts/Items/Misc/Static.cs @@ -54,7 +54,7 @@ namespace Server.Items set{ m_LabelNumber = value; InvalidateProperties(); } } - public override int LabelNumber{ get{ return m_LabelNumber; } } + public override int LabelNumber => m_LabelNumber; [Constructible] public LocalizedStatic( int itemID ) : this( itemID, itemID < 0x4000 ? 1020000 + itemID : 1078872 + itemID ) @@ -95,4 +95,4 @@ namespace Server.Items } } } -} \ No newline at end of file +} diff --git a/Scripts/Items/Misc/Teleporter.cs b/Scripts/Items/Misc/Teleporter.cs index ad5676ba5..aef24ece9 100644 --- a/Scripts/Items/Misc/Teleporter.cs +++ b/Scripts/Items/Misc/Teleporter.cs @@ -88,7 +88,7 @@ namespace Server.Items set { m_CriminalCheck = value; InvalidateProperties(); } } - public override int LabelNumber { get { return 1026095; } } // teleporter + public override int LabelNumber => 1026095; // teleporter [Constructible] public Teleporter() @@ -557,9 +557,8 @@ namespace Server.Items public static void EventSink_Logout(LogoutEventArgs e) { Mobile from = e.Mobile; - TeleportingInfo info; - if (from == null || !m_Table.TryGetValue(from, out info)) + if (from == null || !m_Table.TryGetValue(from, out TeleportingInfo info)) return; info.Timer.Stop(); @@ -636,9 +635,7 @@ namespace Server.Items public override void StartTeleport(Mobile m) { - TeleportingInfo info; - - if (m_Table.TryGetValue(m, out info)) + if (m_Table.TryGetValue( m, out TeleportingInfo info )) { if (info.Teleporter == this) { @@ -717,8 +714,8 @@ namespace Server.Items private WaitTeleporter m_Teleporter; private Timer m_Timer; - public WaitTeleporter Teleporter { get { return m_Teleporter; } } - public Timer Timer { get { return m_Timer; } } + public WaitTeleporter Teleporter => m_Teleporter; + public Timer Timer => m_Timer; public TeleportingInfo(WaitTeleporter tele, Timer t) { @@ -766,9 +763,7 @@ namespace Server.Items private void StartTimer(Mobile m, TimeSpan delay) { - Timer t; - - if (m_Teleporting.TryGetValue(m, out t)) + if (m_Teleporting.TryGetValue( m, out Timer t )) t.Stop(); m_Teleporting[m] = Timer.DelayCall(delay, StartTeleport, m); @@ -776,9 +771,7 @@ namespace Server.Items public void StopTimer(Mobile m) { - Timer t; - - if (m_Teleporting.TryGetValue(m, out t)) + if (m_Teleporting.TryGetValue( m, out Timer t )) { t.Stop(); m_Teleporting.Remove(m); diff --git a/Scripts/Items/Misc/The Citadel/DragonFlameSectBadge.cs b/Scripts/Items/Misc/The Citadel/DragonFlameSectBadge.cs index 04f575ebd..b734836a1 100644 --- a/Scripts/Items/Misc/The Citadel/DragonFlameSectBadge.cs +++ b/Scripts/Items/Misc/The Citadel/DragonFlameSectBadge.cs @@ -5,7 +5,7 @@ namespace Server.Items { public class DragonFlameSectBadge : Item { - public override int LabelNumber{ get{ return 1073141; } } // A Dragon Flame Sect Badge + public override int LabelNumber => 1073141; // A Dragon Flame Sect Badge [Constructible] public DragonFlameSectBadge() : base( 0x23E ) diff --git a/Scripts/Items/Misc/The Citadel/OrdersFromMinax.cs b/Scripts/Items/Misc/The Citadel/OrdersFromMinax.cs index 9d4d8257d..8c039f251 100644 --- a/Scripts/Items/Misc/The Citadel/OrdersFromMinax.cs +++ b/Scripts/Items/Misc/The Citadel/OrdersFromMinax.cs @@ -5,7 +5,7 @@ namespace Server.Items { public class OrdersFromMinax : Item { - public override int LabelNumber{ get{ return 1074639; } } // Orders from Minax + public override int LabelNumber => 1074639; // Orders from Minax [Constructible] public OrdersFromMinax() : base( 0x2279 ) diff --git a/Scripts/Items/Misc/The Citadel/SerpentFangSectBadge.cs b/Scripts/Items/Misc/The Citadel/SerpentFangSectBadge.cs index e057baf95..274774676 100644 --- a/Scripts/Items/Misc/The Citadel/SerpentFangSectBadge.cs +++ b/Scripts/Items/Misc/The Citadel/SerpentFangSectBadge.cs @@ -5,7 +5,7 @@ namespace Server.Items { public class SerpentFangSectBadge : Item { - public override int LabelNumber{ get{ return 1073139; } } // A Serpent Fang Sect Badge + public override int LabelNumber => 1073139; // A Serpent Fang Sect Badge [Constructible] public SerpentFangSectBadge() : base( 0x23C ) diff --git a/Scripts/Items/Misc/The Citadel/TigerClawSectBadge.cs b/Scripts/Items/Misc/The Citadel/TigerClawSectBadge.cs index 7ee51bf1f..596ac7ba1 100644 --- a/Scripts/Items/Misc/The Citadel/TigerClawSectBadge.cs +++ b/Scripts/Items/Misc/The Citadel/TigerClawSectBadge.cs @@ -5,7 +5,7 @@ namespace Server.Items { public class TigerClawSectBadge : Item { - public override int LabelNumber{ get{ return 1073140; } } // A Tiger Claw Sect Badge + public override int LabelNumber => 1073140; // A Tiger Claw Sect Badge [Constructible] public TigerClawSectBadge() : base( 0x23D ) diff --git a/Scripts/Items/Misc/The Citadel/TravestysCollectionOfShells.cs b/Scripts/Items/Misc/The Citadel/TravestysCollectionOfShells.cs index 0d41dda55..3ac7db283 100644 --- a/Scripts/Items/Misc/The Citadel/TravestysCollectionOfShells.cs +++ b/Scripts/Items/Misc/The Citadel/TravestysCollectionOfShells.cs @@ -5,7 +5,7 @@ namespace Server.Items { public class TravestysCollectionOfShells : Item { - public override int LabelNumber{ get{ return 1072090; } } // Travesty's Collection of Shells + public override int LabelNumber => 1072090; // Travesty's Collection of Shells [Constructible] public TravestysCollectionOfShells() : base( 0xFD3 ) diff --git a/Scripts/Items/Misc/The Citadel/TravestysFineTeakwoodTray.cs b/Scripts/Items/Misc/The Citadel/TravestysFineTeakwoodTray.cs index 816460d7d..90e6d0fc8 100644 --- a/Scripts/Items/Misc/The Citadel/TravestysFineTeakwoodTray.cs +++ b/Scripts/Items/Misc/The Citadel/TravestysFineTeakwoodTray.cs @@ -5,7 +5,7 @@ namespace Server.Items { public class TravestysFineTeakwoodTray : Item { - public override int LabelNumber{ get{ return 1075094; } } // Travesty's Fine Teakwood Tray + public override int LabelNumber => 1075094; // Travesty's Fine Teakwood Tray [Constructible] public TravestysFineTeakwoodTray() : base( Utility.Random( 0x991, 2 ) ) diff --git a/Scripts/Items/Misc/The Citadel/TravestysSushiPreparations.cs b/Scripts/Items/Misc/The Citadel/TravestysSushiPreparations.cs index a6682a9e3..1d7a7a22e 100644 --- a/Scripts/Items/Misc/The Citadel/TravestysSushiPreparations.cs +++ b/Scripts/Items/Misc/The Citadel/TravestysSushiPreparations.cs @@ -5,7 +5,7 @@ namespace Server.Items { public class TravestysSushiPreparations : Item { - public override int LabelNumber{ get{ return 1075093; } } // Travesty's Sushi Preparations + public override int LabelNumber => 1075093; // Travesty's Sushi Preparations [Constructible] public TravestysSushiPreparations() : base( Utility.Random( 0x1E15, 2 ) ) diff --git a/Scripts/Items/Misc/TrashBarrel.cs b/Scripts/Items/Misc/TrashBarrel.cs index 455379127..14391810f 100644 --- a/Scripts/Items/Misc/TrashBarrel.cs +++ b/Scripts/Items/Misc/TrashBarrel.cs @@ -7,9 +7,9 @@ namespace Server.Items { public class TrashBarrel : Container, IChopable { - public override int LabelNumber{ get{ return 1041064; } } // a trash barrel + public override int LabelNumber => 1041064; // a trash barrel - public override int DefaultMaxWeight{ get{ return 0; } } // A value of 0 signals unlimited weight + public override int DefaultMaxWeight => 0; // A value of 0 signals unlimited weight public override bool IsDecoContainer { @@ -148,4 +148,4 @@ namespace Server.Items } } } -} \ No newline at end of file +} diff --git a/Scripts/Items/Misc/TrashChest.cs b/Scripts/Items/Misc/TrashChest.cs index b897ecde3..0df03c6be 100644 --- a/Scripts/Items/Misc/TrashChest.cs +++ b/Scripts/Items/Misc/TrashChest.cs @@ -5,7 +5,7 @@ namespace Server.Items [FlippableAttribute( 0xE41, 0xE40 )] public class TrashChest : Container { - public override int DefaultMaxWeight{ get{ return 0; } } // A value of 0 signals unlimited weight + public override int DefaultMaxWeight => 0; // A value of 0 signals unlimited weight public override bool IsDecoContainer { @@ -58,4 +58,4 @@ namespace Server.Items return true; } } -} \ No newline at end of file +} diff --git a/Scripts/Items/Misc/TribalBerry.cs b/Scripts/Items/Misc/TribalBerry.cs index 43fa77c89..72ac4e6e3 100644 --- a/Scripts/Items/Misc/TribalBerry.cs +++ b/Scripts/Items/Misc/TribalBerry.cs @@ -4,7 +4,7 @@ namespace Server.Items { public class TribalBerry : Item { - public override int LabelNumber{ get{ return 1040001; } } // tribal berry + public override int LabelNumber => 1040001; // tribal berry [Constructible] public TribalBerry() : this( 1 ) @@ -24,7 +24,7 @@ namespace Server.Items { } - + public override void Serialize( GenericWriter writer ) { @@ -43,4 +43,4 @@ namespace Server.Items Hue = 6; } } -} \ No newline at end of file +} diff --git a/Scripts/Items/Misc/TribalPaint.cs b/Scripts/Items/Misc/TribalPaint.cs index 905948254..69764c824 100644 --- a/Scripts/Items/Misc/TribalPaint.cs +++ b/Scripts/Items/Misc/TribalPaint.cs @@ -7,7 +7,7 @@ namespace Server.Items { public class TribalPaint : Item { - public override int LabelNumber{ get{ return 1040000; } } // savage kin paint + public override int LabelNumber => 1040000; // savage kin paint [Constructible] public TribalPaint() : base( 0x9EC ) @@ -82,4 +82,4 @@ namespace Server.Items int version = reader.ReadInt(); } } -} \ No newline at end of file +} diff --git a/Scripts/Items/Misc/Twisted Weald/HornOfTheDreadhorn.cs b/Scripts/Items/Misc/Twisted Weald/HornOfTheDreadhorn.cs index 6d6d1bc9a..bbd88d101 100644 --- a/Scripts/Items/Misc/Twisted Weald/HornOfTheDreadhorn.cs +++ b/Scripts/Items/Misc/Twisted Weald/HornOfTheDreadhorn.cs @@ -5,7 +5,7 @@ namespace Server.Items [Flippable(0x315C, 0x315D)] public class HornOfTheDreadhorn : Item { - public override int LabelNumber{ get{ return 1072089; } } // Horn of the Dread + public override int LabelNumber => 1072089; // Horn of the Dread [Constructible] public HornOfTheDreadhorn() : base( 0x315C ) diff --git a/Scripts/Items/Misc/Twisted Weald/MangledHeadOfDreadhorn.cs b/Scripts/Items/Misc/Twisted Weald/MangledHeadOfDreadhorn.cs index e26f2d741..8b0c280b5 100644 --- a/Scripts/Items/Misc/Twisted Weald/MangledHeadOfDreadhorn.cs +++ b/Scripts/Items/Misc/Twisted Weald/MangledHeadOfDreadhorn.cs @@ -5,7 +5,7 @@ namespace Server.Items [Flippable(0x3156, 0x3157)] public class MangledHeadOfDreadhorn : Item { - public override int LabelNumber{ get{ return 1072088; } } // The Mangled Head of Dread Horn + public override int LabelNumber => 1072088; // The Mangled Head of Dread Horn [Constructible] public MangledHeadOfDreadhorn() : base( 0x3156 ) diff --git a/Scripts/Items/Misc/Twisted Weald/TaintedMushroom.cs b/Scripts/Items/Misc/Twisted Weald/TaintedMushroom.cs index d073f737f..8333038fb 100644 --- a/Scripts/Items/Misc/Twisted Weald/TaintedMushroom.cs +++ b/Scripts/Items/Misc/Twisted Weald/TaintedMushroom.cs @@ -4,7 +4,7 @@ namespace Server.Items { public class TaintedMushroom : Item { - public override int LabelNumber{ get{ return 1075088; } } // Dread Horn Tainted Mushroom + public override int LabelNumber => 1075088; // Dread Horn Tainted Mushroom public override bool ForceShowProperties => true; [Constructible] diff --git a/Scripts/Items/Misc/WarningItem.cs b/Scripts/Items/Misc/WarningItem.cs index c379287d2..c6974781f 100644 --- a/Scripts/Items/Misc/WarningItem.cs +++ b/Scripts/Items/Misc/WarningItem.cs @@ -92,7 +92,7 @@ namespace Server.Items } public virtual bool OnlyToTriggerer{ get{ return false; } } - public virtual int NeighborRange { get { return 5; } } + public virtual int NeighborRange => 5; public virtual void Broadcast( Mobile triggerer ) { diff --git a/Scripts/Items/Misc/WindChimes.cs b/Scripts/Items/Misc/WindChimes.cs index 8ec8e0d27..ad592da26 100644 --- a/Scripts/Items/Misc/WindChimes.cs +++ b/Scripts/Items/Misc/WindChimes.cs @@ -137,7 +137,7 @@ namespace Server.Items public class WindChimes : BaseWindChimes { - public override int LabelNumber{ get{ return 1030290; } } + public override int LabelNumber => 1030290; [Constructible] public WindChimes() : base( 0x2832 ) @@ -163,7 +163,7 @@ namespace Server.Items public class FancyWindChimes : BaseWindChimes { - public override int LabelNumber{ get{ return 1030291; } } + public override int LabelNumber => 1030291; [Constructible] public FancyWindChimes() : base( 0x2833 ) diff --git a/Scripts/Items/New Haven Quest Rewards/AmeliasToolbox.cs b/Scripts/Items/New Haven Quest Rewards/AmeliasToolbox.cs index 3eadad648..c06ec5d22 100644 --- a/Scripts/Items/New Haven Quest Rewards/AmeliasToolbox.cs +++ b/Scripts/Items/New Haven Quest Rewards/AmeliasToolbox.cs @@ -5,7 +5,7 @@ namespace Server.Items { public class AmeliasToolbox : TinkerTools { - public override int LabelNumber{ get{ return 1077749; } } // Amelias Toolbox + public override int LabelNumber => 1077749; // Amelias Toolbox [Constructible] public AmeliasToolbox() : base( 500 ) diff --git a/Scripts/Items/New Haven Quest Rewards/ArmsOfArmstrong.cs b/Scripts/Items/New Haven Quest Rewards/ArmsOfArmstrong.cs index 288d053a1..84e927034 100644 --- a/Scripts/Items/New Haven Quest Rewards/ArmsOfArmstrong.cs +++ b/Scripts/Items/New Haven Quest Rewards/ArmsOfArmstrong.cs @@ -5,13 +5,13 @@ namespace Server.Items { public class ArmsOfArmstrong : LeatherArms { - public override int LabelNumber{ get{ return 1077675; } } // Arms of Armstrong + public override int LabelNumber => 1077675; // Arms of Armstrong - public override int BasePhysicalResistance{ get{ return 6; } } - public override int BaseFireResistance{ get{ return 6; } } - public override int BaseColdResistance{ get{ return 5; } } - public override int BasePoisonResistance{ get{ return 5; } } - public override int BaseEnergyResistance{ get{ return 5; } } + public override int BasePhysicalResistance => 6; + public override int BaseFireResistance => 6; + public override int BaseColdResistance => 5; + public override int BasePoisonResistance => 5; + public override int BaseEnergyResistance => 5; [Constructible] public ArmsOfArmstrong() diff --git a/Scripts/Items/New Haven Quest Rewards/BraceletOfResilience.cs b/Scripts/Items/New Haven Quest Rewards/BraceletOfResilience.cs index 3033e05ad..3c616fb10 100644 --- a/Scripts/Items/New Haven Quest Rewards/BraceletOfResilience.cs +++ b/Scripts/Items/New Haven Quest Rewards/BraceletOfResilience.cs @@ -5,7 +5,7 @@ namespace Server.Items { public class BraceletOfResilience : GoldBracelet { - public override int LabelNumber{ get{ return 1077627; } } // Bracelet of Resilience + public override int LabelNumber => 1077627; // Bracelet of Resilience [Constructible] public BraceletOfResilience() diff --git a/Scripts/Items/New Haven Quest Rewards/BulwarkLeggings.cs b/Scripts/Items/New Haven Quest Rewards/BulwarkLeggings.cs index 19653155b..e3bbeae61 100644 --- a/Scripts/Items/New Haven Quest Rewards/BulwarkLeggings.cs +++ b/Scripts/Items/New Haven Quest Rewards/BulwarkLeggings.cs @@ -5,13 +5,13 @@ namespace Server.Items { public class BulwarkLeggings : RingmailLegs { - public override int LabelNumber{ get{ return 1077727; } } // Bulwark Leggings + public override int LabelNumber => 1077727; // Bulwark Leggings - public override int BasePhysicalResistance{ get{ return 9; } } - public override int BaseFireResistance{ get{ return 5; } } - public override int BaseColdResistance{ get{ return 5; } } - public override int BasePoisonResistance{ get{ return 5; } } - public override int BaseEnergyResistance{ get{ return 3; } } + public override int BasePhysicalResistance => 9; + public override int BaseFireResistance => 5; + public override int BaseColdResistance => 5; + public override int BasePoisonResistance => 5; + public override int BaseEnergyResistance => 3; [Constructible] public BulwarkLeggings() diff --git a/Scripts/Items/New Haven Quest Rewards/ChurchillsWarMace.cs b/Scripts/Items/New Haven Quest Rewards/ChurchillsWarMace.cs index d2a5946be..65f6a4962 100644 --- a/Scripts/Items/New Haven Quest Rewards/ChurchillsWarMace.cs +++ b/Scripts/Items/New Haven Quest Rewards/ChurchillsWarMace.cs @@ -5,7 +5,7 @@ namespace Server.Items { public class ChurchillsWarMace : WarMace { - public override int LabelNumber{ get{ return 1078062; } } // Churchill's War Mace + public override int LabelNumber => 1078062; // Churchill's War Mace [Constructible] public ChurchillsWarMace() diff --git a/Scripts/Items/New Haven Quest Rewards/ClaspOfConcentration.cs b/Scripts/Items/New Haven Quest Rewards/ClaspOfConcentration.cs index 43d358b1a..4ec7d2fbf 100644 --- a/Scripts/Items/New Haven Quest Rewards/ClaspOfConcentration.cs +++ b/Scripts/Items/New Haven Quest Rewards/ClaspOfConcentration.cs @@ -5,7 +5,7 @@ namespace Server.Items { public class ClaspOfConcentration : SilverBracelet { - public override int LabelNumber{ get{ return 1077695; } } // Clasp of Concentration + public override int LabelNumber => 1077695; // Clasp of Concentration [Constructible] public ClaspOfConcentration() diff --git a/Scripts/Items/New Haven Quest Rewards/EmberStaff.cs b/Scripts/Items/New Haven Quest Rewards/EmberStaff.cs index b18f1a009..5c3bf3d15 100644 --- a/Scripts/Items/New Haven Quest Rewards/EmberStaff.cs +++ b/Scripts/Items/New Haven Quest Rewards/EmberStaff.cs @@ -5,7 +5,7 @@ namespace Server.Items { public class EmberStaff : QuarterStaff { - public override int LabelNumber{ get{ return 1077582; } } // Ember Staff + public override int LabelNumber => 1077582; // Ember Staff [Constructible] public EmberStaff() diff --git a/Scripts/Items/New Haven Quest Rewards/EscutcheonDeAriadne.cs b/Scripts/Items/New Haven Quest Rewards/EscutcheonDeAriadne.cs index 7045c9670..bdb6f7af9 100644 --- a/Scripts/Items/New Haven Quest Rewards/EscutcheonDeAriadne.cs +++ b/Scripts/Items/New Haven Quest Rewards/EscutcheonDeAriadne.cs @@ -5,12 +5,12 @@ namespace Server.Items { public class EscutcheonDeAriadne : MetalKiteShield { - public override int LabelNumber{ get{ return 1077694; } } // Escutcheon de Ariadne + public override int LabelNumber => 1077694; // Escutcheon de Ariadne - public override int BasePhysicalResistance{ get{ return 5; } } - public override int BaseEnergyResistance{ get{ return 1; } } + public override int BasePhysicalResistance => 5; + public override int BaseEnergyResistance => 1; - public override int AosStrReq{ get{ return 14; } } + public override int AosStrReq => 14; [Constructible] public EscutcheonDeAriadne() diff --git a/Scripts/Items/New Haven Quest Rewards/GlovesOfSafeguarding.cs b/Scripts/Items/New Haven Quest Rewards/GlovesOfSafeguarding.cs index 6e5636b6e..861067993 100644 --- a/Scripts/Items/New Haven Quest Rewards/GlovesOfSafeguarding.cs +++ b/Scripts/Items/New Haven Quest Rewards/GlovesOfSafeguarding.cs @@ -5,13 +5,13 @@ namespace Server.Items { public class GlovesOfSafeguarding : LeatherGloves { - public override int LabelNumber{ get{ return 1077614; } } // Gloves of Safeguarding + public override int LabelNumber => 1077614; // Gloves of Safeguarding - public override int BasePhysicalResistance{ get{ return 6; } } - public override int BaseFireResistance{ get{ return 6; } } - public override int BaseColdResistance{ get{ return 5; } } - public override int BasePoisonResistance{ get{ return 5; } } - public override int BaseEnergyResistance{ get{ return 5; } } + public override int BasePhysicalResistance => 6; + public override int BaseFireResistance => 6; + public override int BaseColdResistance => 5; + public override int BasePoisonResistance => 5; + public override int BaseEnergyResistance => 5; [Constructible] public GlovesOfSafeguarding() diff --git a/Scripts/Items/New Haven Quest Rewards/HallowedSpellbook.cs b/Scripts/Items/New Haven Quest Rewards/HallowedSpellbook.cs index 204a3dcd6..78dc4a45b 100644 --- a/Scripts/Items/New Haven Quest Rewards/HallowedSpellbook.cs +++ b/Scripts/Items/New Haven Quest Rewards/HallowedSpellbook.cs @@ -5,7 +5,7 @@ namespace Server.Items { public class HallowedSpellbook : Spellbook { - public override int LabelNumber { get { return 1077620; } } // Hallowed Spellbook + public override int LabelNumber => 1077620; // Hallowed Spellbook [Constructible] public HallowedSpellbook() : base( 0x3FFFFFFFF ) diff --git a/Scripts/Items/New Haven Quest Rewards/HammerOfHephaestus.cs b/Scripts/Items/New Haven Quest Rewards/HammerOfHephaestus.cs index 1857d3cb7..ce645e84c 100644 --- a/Scripts/Items/New Haven Quest Rewards/HammerOfHephaestus.cs +++ b/Scripts/Items/New Haven Quest Rewards/HammerOfHephaestus.cs @@ -6,7 +6,7 @@ namespace Server.Items [FlippableAttribute( 0x13E3, 0x13E4 )] public class HammerOfHephaestus : SmithHammer { - public override int LabelNumber{ get{ return 1077740; } } // Hammer of Hephaestus + public override int LabelNumber => 1077740; // Hammer of Hephaestus public static readonly TimeSpan RechargeDelay = TimeSpan.FromMinutes( 5 ); diff --git a/Scripts/Items/New Haven Quest Rewards/HealersTouch.cs b/Scripts/Items/New Haven Quest Rewards/HealersTouch.cs index 82c4f7f16..66f3082ab 100644 --- a/Scripts/Items/New Haven Quest Rewards/HealersTouch.cs +++ b/Scripts/Items/New Haven Quest Rewards/HealersTouch.cs @@ -5,13 +5,13 @@ namespace Server.Items { public class HealersTouch : LeatherGloves { - public override int LabelNumber{ get{ return 1077684; } } // Healer's Touch + public override int LabelNumber => 1077684; // Healer's Touch - public override int BasePhysicalResistance{ get{ return 6; } } - public override int BaseFireResistance{ get{ return 6; } } - public override int BaseColdResistance{ get{ return 5; } } - public override int BasePoisonResistance{ get{ return 5; } } - public override int BaseEnergyResistance{ get{ return 5; } } + public override int BasePhysicalResistance => 6; + public override int BaseFireResistance => 6; + public override int BaseColdResistance => 5; + public override int BasePoisonResistance => 5; + public override int BaseEnergyResistance => 5; [Constructible] public HealersTouch() diff --git a/Scripts/Items/New Haven Quest Rewards/Heartseeker.cs b/Scripts/Items/New Haven Quest Rewards/Heartseeker.cs index aad955b05..2ebc18e0c 100644 --- a/Scripts/Items/New Haven Quest Rewards/Heartseeker.cs +++ b/Scripts/Items/New Haven Quest Rewards/Heartseeker.cs @@ -5,7 +5,7 @@ namespace Server.Items { public class Heartseeker : CompositeBow { - public override int LabelNumber{ get{ return 1078210; } } // Heartseeker + public override int LabelNumber => 1078210; // Heartseeker [Constructible] public Heartseeker() diff --git a/Scripts/Items/New Haven Quest Rewards/JacobsPickaxe.cs b/Scripts/Items/New Haven Quest Rewards/JacobsPickaxe.cs index 774f084e0..534d687fd 100644 --- a/Scripts/Items/New Haven Quest Rewards/JacobsPickaxe.cs +++ b/Scripts/Items/New Haven Quest Rewards/JacobsPickaxe.cs @@ -5,7 +5,7 @@ namespace Server.Items { public class JacobsPickaxe : Pickaxe { - public override int LabelNumber{ get{ return 1077758; } } // Jacob's Pickaxe + public override int LabelNumber => 1077758; // Jacob's Pickaxe // TODO: Recharges 1 use every 5 minutes. Doesn't break when it reaches 0, you get a system message "You must wait a moment for it to recharge" 1072306 if you attempt to use it with no uses remaining. diff --git a/Scripts/Items/New Haven Quest Rewards/JocklesQuicksword.cs b/Scripts/Items/New Haven Quest Rewards/JocklesQuicksword.cs index 826874c4c..00a66b8f9 100644 --- a/Scripts/Items/New Haven Quest Rewards/JocklesQuicksword.cs +++ b/Scripts/Items/New Haven Quest Rewards/JocklesQuicksword.cs @@ -5,7 +5,7 @@ namespace Server.Items { public class JocklesQuicksword : Longsword { - public override int LabelNumber{ get{ return 1077666; } } // Jockles' Quicksword + public override int LabelNumber => 1077666; // Jockles' Quicksword [Constructible] public JocklesQuicksword() diff --git a/Scripts/Items/New Haven Quest Rewards/PhilosophersHat.cs b/Scripts/Items/New Haven Quest Rewards/PhilosophersHat.cs index 6c00aaad5..88cb0593b 100644 --- a/Scripts/Items/New Haven Quest Rewards/PhilosophersHat.cs +++ b/Scripts/Items/New Haven Quest Rewards/PhilosophersHat.cs @@ -5,13 +5,13 @@ namespace Server.Items { public class PhilosophersHat : WizardsHat { - public override int LabelNumber{ get{ return 1077602; } } // Philosopher's Hat + public override int LabelNumber => 1077602; // Philosopher's Hat - public override int BasePhysicalResistance{ get{ return 5; } } - public override int BaseFireResistance{ get{ return 5; } } - public override int BaseColdResistance{ get{ return 9; } } - public override int BasePoisonResistance{ get{ return 5; } } - public override int BaseEnergyResistance{ get{ return 5; } } + public override int BasePhysicalResistance => 5; + public override int BaseFireResistance => 5; + public override int BaseColdResistance => 9; + public override int BasePoisonResistance => 5; + public override int BaseEnergyResistance => 5; [Constructible] public PhilosophersHat() diff --git a/Scripts/Items/New Haven Quest Rewards/RecarosRiposte.cs b/Scripts/Items/New Haven Quest Rewards/RecarosRiposte.cs index 6d931555d..b1e90be0d 100644 --- a/Scripts/Items/New Haven Quest Rewards/RecarosRiposte.cs +++ b/Scripts/Items/New Haven Quest Rewards/RecarosRiposte.cs @@ -5,7 +5,7 @@ namespace Server.Items { public class RecarosRiposte : WarFork { - public override int LabelNumber{ get{ return 1078195; } } // Recaro's Riposte + public override int LabelNumber => 1078195; // Recaro's Riposte [Constructible] public RecarosRiposte() diff --git a/Scripts/Items/New Haven Quest Rewards/RingOfTheSavant.cs b/Scripts/Items/New Haven Quest Rewards/RingOfTheSavant.cs index 77c54c333..8c11a2a4d 100644 --- a/Scripts/Items/New Haven Quest Rewards/RingOfTheSavant.cs +++ b/Scripts/Items/New Haven Quest Rewards/RingOfTheSavant.cs @@ -5,7 +5,7 @@ namespace Server.Items { public class RingOfTheSavant : GoldRing { - public override int LabelNumber{ get{ return 1077608; } } // Ring of the Savant + public override int LabelNumber => 1077608; // Ring of the Savant [Constructible] public RingOfTheSavant() diff --git a/Scripts/Items/New Haven Quest Rewards/SilverSerpentBlade.cs b/Scripts/Items/New Haven Quest Rewards/SilverSerpentBlade.cs index 3c19a95f5..b4c379172 100644 --- a/Scripts/Items/New Haven Quest Rewards/SilverSerpentBlade.cs +++ b/Scripts/Items/New Haven Quest Rewards/SilverSerpentBlade.cs @@ -5,7 +5,7 @@ namespace Server.Items { public class SilverSerpentBlade : Kryss { - public override int LabelNumber{ get{ return 1078163; } } // Silver Serpent Blade + public override int LabelNumber => 1078163; // Silver Serpent Blade [Constructible] public SilverSerpentBlade() diff --git a/Scripts/Items/New Haven Quest Rewards/TheDragonsTail.cs b/Scripts/Items/New Haven Quest Rewards/TheDragonsTail.cs index e2c9c990f..25d8d8e5c 100644 --- a/Scripts/Items/New Haven Quest Rewards/TheDragonsTail.cs +++ b/Scripts/Items/New Haven Quest Rewards/TheDragonsTail.cs @@ -5,10 +5,10 @@ namespace Server.Items { public class TheDragonsTail : NoDachi { - public override int LabelNumber { get { return 1078015; } } // The Dragon's Tail + public override int LabelNumber => 1078015; // The Dragon's Tail - public override int InitMinHits{ get{ return 80; } } - public override int InitMaxHits{ get{ return 80; } } + public override int InitMinHits => 80; + public override int InitMaxHits => 80; [Constructible] public TheDragonsTail() diff --git a/Scripts/Items/New Haven Quest Rewards/TunicOfGuarding.cs b/Scripts/Items/New Haven Quest Rewards/TunicOfGuarding.cs index 6193b2ddf..e643243f4 100644 --- a/Scripts/Items/New Haven Quest Rewards/TunicOfGuarding.cs +++ b/Scripts/Items/New Haven Quest Rewards/TunicOfGuarding.cs @@ -5,13 +5,13 @@ namespace Server.Items { public class TunicOfGuarding : LeatherChest { - public override int LabelNumber{ get{ return 1077693; } } // Tunic of Guarding + public override int LabelNumber => 1077693; // Tunic of Guarding - public override int BasePhysicalResistance{ get{ return 6; } } - public override int BaseFireResistance{ get{ return 6; } } - public override int BaseColdResistance{ get{ return 5; } } - public override int BasePoisonResistance{ get{ return 5; } } - public override int BaseEnergyResistance{ get{ return 5; } } + public override int BasePhysicalResistance => 6; + public override int BaseFireResistance => 6; + public override int BaseColdResistance => 5; + public override int BasePoisonResistance => 5; + public override int BaseEnergyResistance => 5; [Constructible] public TunicOfGuarding() diff --git a/Scripts/Items/New Haven Quest Rewards/TwilightJacket.cs b/Scripts/Items/New Haven Quest Rewards/TwilightJacket.cs index 2b8209c96..f3092ee04 100644 --- a/Scripts/Items/New Haven Quest Rewards/TwilightJacket.cs +++ b/Scripts/Items/New Haven Quest Rewards/TwilightJacket.cs @@ -5,13 +5,13 @@ namespace Server.Items { public class TwilightJacket : LeatherNinjaJacket { - public override int LabelNumber{ get{ return 1078183; } } // Twilight Jacket + public override int LabelNumber => 1078183; // Twilight Jacket - public override int BasePhysicalResistance{ get{ return 6; } } - public override int BaseFireResistance{ get{ return 12; } } - public override int BaseColdResistance{ get{ return 3; } } - public override int BasePoisonResistance{ get{ return 3; } } - public override int BaseEnergyResistance{ get{ return 3; } } + public override int BasePhysicalResistance => 6; + public override int BaseFireResistance => 12; + public override int BaseColdResistance => 3; + public override int BasePoisonResistance => 3; + public override int BaseEnergyResistance => 3; [Constructible] public TwilightJacket() diff --git a/Scripts/Items/New Haven Quest Rewards/WalkersLeggings.cs b/Scripts/Items/New Haven Quest Rewards/WalkersLeggings.cs index 47dd66ca5..6d43295b3 100644 --- a/Scripts/Items/New Haven Quest Rewards/WalkersLeggings.cs +++ b/Scripts/Items/New Haven Quest Rewards/WalkersLeggings.cs @@ -5,13 +5,13 @@ namespace Server.Items { public class WalkersLeggings : LeatherNinjaPants { - public override int LabelNumber{ get{ return 1078222; } } // Walker's Leggings + public override int LabelNumber => 1078222; // Walker's Leggings - public override int BasePhysicalResistance{ get{ return 10; } } - public override int BaseFireResistance{ get{ return 6; } } - public override int BaseColdResistance{ get{ return 6; } } - public override int BasePoisonResistance{ get{ return 3; } } - public override int BaseEnergyResistance{ get{ return 3; } } + public override int BasePhysicalResistance => 10; + public override int BaseFireResistance => 6; + public override int BaseColdResistance => 6; + public override int BasePoisonResistance => 3; + public override int BaseEnergyResistance => 3; [Constructible] public WalkersLeggings() diff --git a/Scripts/Items/Quivers/BaseQuiver.cs b/Scripts/Items/Quivers/BaseQuiver.cs index e850a3073..72c028fb1 100644 --- a/Scripts/Items/Quivers/BaseQuiver.cs +++ b/Scripts/Items/Quivers/BaseQuiver.cs @@ -6,10 +6,10 @@ namespace Server.Items { public class BaseQuiver : Container, ICraftable { - public override int DefaultGumpID{ get{ return 0x108; } } - public override int DefaultMaxItems{ get{ return 1; } } - public override int DefaultMaxWeight{ get{ return 50; } } - public override double DefaultWeight{ get{ return 2.0; } } + public override int DefaultGumpID => 0x108; + public override int DefaultMaxItems => 1; + public override int DefaultMaxWeight => 50; + public override double DefaultWeight => 2.0; private AosAttributes m_Attributes; private int m_Capacity; @@ -68,7 +68,7 @@ namespace Server.Items get{ return m_Quality; } set{ m_Quality = value; InvalidateProperties(); } } - + public Item Ammo { get{ return Items.Count > 0 ? Items[ 0 ] : null; } @@ -184,7 +184,7 @@ namespace Server.Items InvalidateWeight(); } - + public override void RemoveItem( Item dropped ) { base.RemoveItem( dropped ); @@ -215,7 +215,7 @@ namespace Server.Items public override void GetProperties( ObjectPropertyList list ) { base.GetProperties( list ); - + if ( m_Crafter != null ) list.Add( 1050043, m_Crafter.Name ); // crafted by ~1_NAME~ @@ -238,7 +238,7 @@ namespace Server.Items if ( (prop = m_DamageIncrease) != 0 ) list.Add( 1074762, prop.ToString() ); // Damage modifier: ~1_PERCENT~% - + int phys, fire, cold, pois, nrgy, chaos, direct; phys = fire = cold = pois = nrgy = chaos = direct = 0; @@ -295,7 +295,7 @@ namespace Server.Items list.Add( 1060433, prop.ToString() ); // lower mana cost ~1_val~% if ( (prop = m_Attributes.LowerRegCost) != 0 ) - list.Add( 1060434, prop.ToString() ); // lower reagent cost ~1_val~% + list.Add( 1060434, prop.ToString() ); // lower reagent cost ~1_val~% if ( (prop = m_Attributes.Luck) != 0 ) list.Add( 1060436, prop.ToString() ); // luck ~1_val~ @@ -341,9 +341,9 @@ namespace Server.Items list.Add( 1072241, "{0}\t{1}\t{2}\t{3}", Items.Count, DefaultMaxItems, (int) weight, DefaultMaxWeight ); // Contents: ~1_COUNT~/~2_MAXCOUNT items, ~3_WEIGHT~/~4_MAXWEIGHT~ stones if ( (prop = m_WeightReduction) != 0 ) - list.Add( 1072210, prop.ToString() ); // Weight reduction: ~1_PERCENTAGE~% + list.Add( 1072210, prop.ToString() ); // Weight reduction: ~1_PERCENTAGE~% } - + private static void SetSaveFlag( ref SaveFlag flags, SaveFlag toSet, bool setIf ) { if ( setIf ) @@ -454,7 +454,7 @@ namespace Server.Items m.UpdateTotals(); } } - + #region ICraftable public virtual int OnCraft( int quality, bool makersMark, Mobile from, CraftSystem craftSystem, Type typeRes, BaseTool tool, CraftItem craftItem, int resHue ) { diff --git a/Scripts/Items/Quivers/ElvenQuiver.cs b/Scripts/Items/Quivers/ElvenQuiver.cs index 036626819..197299f2f 100644 --- a/Scripts/Items/Quivers/ElvenQuiver.cs +++ b/Scripts/Items/Quivers/ElvenQuiver.cs @@ -6,10 +6,10 @@ namespace Server.Items [FlippableAttribute( 0x2FB7, 0x3171 )] public class ElvenQuiver : BaseQuiver { - public override int LabelNumber{ get{ return 1032657; } } // elven quiver - + public override int LabelNumber => 1032657; // elven quiver + [Constructible] - public ElvenQuiver() : base() + public ElvenQuiver() { WeightReduction = 30; } diff --git a/Scripts/Items/Quivers/QuiverOfBlight.cs b/Scripts/Items/Quivers/QuiverOfBlight.cs index 0947886bc..2a4930340 100644 --- a/Scripts/Items/Quivers/QuiverOfBlight.cs +++ b/Scripts/Items/Quivers/QuiverOfBlight.cs @@ -5,10 +5,10 @@ namespace Server.Items { public class QuiverOfBlight : ElvenQuiver { - public override int LabelNumber{ get{ return 1073111; } } // Quiver of Blight - + public override int LabelNumber => 1073111; // Quiver of Blight + [Constructible] - public QuiverOfBlight() : base() + public QuiverOfBlight() { Hue = 0x4F3; } diff --git a/Scripts/Items/Quivers/QuiverOfFire.cs b/Scripts/Items/Quivers/QuiverOfFire.cs index 527d4f463..e323c0f32 100644 --- a/Scripts/Items/Quivers/QuiverOfFire.cs +++ b/Scripts/Items/Quivers/QuiverOfFire.cs @@ -5,10 +5,10 @@ namespace Server.Items { public class QuiverOfFire : ElvenQuiver { - public override int LabelNumber{ get{ return 1073109; } } // quiver of fire - + public override int LabelNumber => 1073109; // quiver of fire + [Constructible] - public QuiverOfFire() : base() + public QuiverOfFire() { Hue = 0x4E7; } diff --git a/Scripts/Items/Quivers/QuiverOfIce.cs b/Scripts/Items/Quivers/QuiverOfIce.cs index a9371e549..de1944109 100644 --- a/Scripts/Items/Quivers/QuiverOfIce.cs +++ b/Scripts/Items/Quivers/QuiverOfIce.cs @@ -5,10 +5,10 @@ namespace Server.Items { public class QuiverOfIce : ElvenQuiver { - public override int LabelNumber{ get{ return 1073110; } } // quiver of ice - + public override int LabelNumber => 1073110; // quiver of ice + [Constructible] - public QuiverOfIce() : base() + public QuiverOfIce() { Hue = 0x4ED; } diff --git a/Scripts/Items/Quivers/QuiverOfLightning.cs b/Scripts/Items/Quivers/QuiverOfLightning.cs index f4581ba42..3ba1e0b25 100644 --- a/Scripts/Items/Quivers/QuiverOfLightning.cs +++ b/Scripts/Items/Quivers/QuiverOfLightning.cs @@ -4,11 +4,11 @@ using Server; namespace Server.Items { public class QuiverOfLightning : ElvenQuiver - { - public override int LabelNumber{ get{ return 1073112; } } // Quiver of Lightning - + { + public override int LabelNumber => 1073112; // Quiver of Lightning + [Constructible] - public QuiverOfLightning() : base() + public QuiverOfLightning() { Hue = 0x4F9; } diff --git a/Scripts/Items/Resources/Blacksmithing/Scales.cs b/Scripts/Items/Resources/Blacksmithing/Scales.cs index 8dc51e565..1c7e99e6a 100644 --- a/Scripts/Items/Resources/Blacksmithing/Scales.cs +++ b/Scripts/Items/Resources/Blacksmithing/Scales.cs @@ -6,7 +6,7 @@ namespace Server.Items { public abstract class BaseScales : Item, ICommodity { - public override int LabelNumber{ get{ return 1053139; } } // dragon scales + public override int LabelNumber => 1053139; // dragon scales private CraftResource m_Resource; @@ -21,7 +21,7 @@ namespace Server.Items { get { return 0.1; } } - + int ICommodity.DescriptionNumber { get { return LabelNumber; } } bool ICommodity.IsDeedable { get { return true; } } @@ -98,7 +98,7 @@ namespace Server.Items int version = reader.ReadInt(); } - + } public class YellowScales : BaseScales @@ -131,7 +131,7 @@ namespace Server.Items int version = reader.ReadInt(); } - + } public class BlackScales : BaseScales @@ -164,7 +164,7 @@ namespace Server.Items int version = reader.ReadInt(); } - + } public class GreenScales : BaseScales @@ -197,7 +197,7 @@ namespace Server.Items int version = reader.ReadInt(); } - + } public class WhiteScales : BaseScales @@ -230,12 +230,12 @@ namespace Server.Items int version = reader.ReadInt(); } - + } public class BlueScales : BaseScales { - public override int LabelNumber{ get{ return 1053140; } } // sea serpent scales + public override int LabelNumber => 1053140; // sea serpent scales [Constructible] public BlueScales() : this( 1 ) @@ -265,6 +265,6 @@ namespace Server.Items int version = reader.ReadInt(); } - + } -} \ No newline at end of file +} diff --git a/Scripts/Items/Resources/Fishing/BigFish.cs b/Scripts/Items/Resources/Fishing/BigFish.cs index 1bbc6cdc8..3bd17bf9e 100644 --- a/Scripts/Items/Resources/Fishing/BigFish.cs +++ b/Scripts/Items/Resources/Fishing/BigFish.cs @@ -20,7 +20,7 @@ namespace Server.Items base.ScissorHelper( from, new RawFishSteak(), Math.Max( 16, (int)Weight ) / 4 , false ); } - public override int LabelNumber{ get{ return 1041112; } } // a big fish + public override int LabelNumber => 1041112; // a big fish [Constructible] public BigFish() : base( 0x09CC ) @@ -76,4 +76,4 @@ namespace Server.Items } } } -} \ No newline at end of file +} diff --git a/Scripts/Items/Resources/Fishing/MagicFish.cs b/Scripts/Items/Resources/Fishing/MagicFish.cs index 6603a86f6..3fd3f6def 100644 --- a/Scripts/Items/Resources/Fishing/MagicFish.cs +++ b/Scripts/Items/Resources/Fishing/MagicFish.cs @@ -64,10 +64,10 @@ namespace Server.Items public class PrizedFish : BaseMagicFish { - public override int Bonus{ get{ return 5; } } - public override StatType Type{ get{ return StatType.Int; } } + public override int Bonus => 5; + public override StatType Type => StatType.Int; - public override int LabelNumber{ get{ return 1041073; } } // prized fish + public override int LabelNumber => 1041073; // prized fish [Constructible] public PrizedFish() : base( 51 ) @@ -98,10 +98,10 @@ namespace Server.Items public class WondrousFish : BaseMagicFish { - public override int Bonus{ get{ return 5; } } - public override StatType Type{ get{ return StatType.Dex; } } + public override int Bonus => 5; + public override StatType Type => StatType.Dex; - public override int LabelNumber{ get{ return 1041074; } } // wondrous fish + public override int LabelNumber => 1041074; // wondrous fish [Constructible] public WondrousFish() : base( 86 ) @@ -132,10 +132,10 @@ namespace Server.Items public class TrulyRareFish : BaseMagicFish { - public override int Bonus{ get{ return 5; } } - public override StatType Type{ get{ return StatType.Str; } } + public override int Bonus => 5; + public override StatType Type => StatType.Str; - public override int LabelNumber{ get{ return 1041075; } } // truly rare fish + public override int LabelNumber => 1041075; // truly rare fish [Constructible] public TrulyRareFish() : base( 76 ) @@ -166,7 +166,7 @@ namespace Server.Items public class PeculiarFish : BaseMagicFish { - public override int LabelNumber{ get{ return 1041076; } } // highly peculiar fish + public override int LabelNumber => 1041076; // highly peculiar fish [Constructible] public PeculiarFish() : base( 66 ) @@ -200,4 +200,4 @@ namespace Server.Items Hue = 66; } } -} \ No newline at end of file +} diff --git a/Scripts/Items/Resources/Masonry/Granite.cs b/Scripts/Items/Resources/Masonry/Granite.cs index e84e5ed3c..47d69f1a5 100644 --- a/Scripts/Items/Resources/Masonry/Granite.cs +++ b/Scripts/Items/Resources/Masonry/Granite.cs @@ -61,7 +61,7 @@ namespace Server.Items { } - public override int LabelNumber{ get{ return 1044607; } } // high quality granite + public override int LabelNumber => 1044607; // high quality granite public override void GetProperties( ObjectPropertyList list ) { @@ -312,4 +312,4 @@ namespace Server.Items int version = reader.ReadInt(); } } -} \ No newline at end of file +} diff --git a/Scripts/Items/Shields/Artifacts/Aegis.cs b/Scripts/Items/Shields/Artifacts/Aegis.cs index cc672b37d..15255c5a3 100644 --- a/Scripts/Items/Shields/Artifacts/Aegis.cs +++ b/Scripts/Items/Shields/Artifacts/Aegis.cs @@ -5,13 +5,13 @@ namespace Server.Items { public class Aegis : HeaterShield { - public override int LabelNumber{ get{ return 1061602; } } // Ægis - public override int ArtifactRarity{ get{ return 11; } } + public override int LabelNumber => 1061602; // �gis + public override int ArtifactRarity => 11; - public override int BasePhysicalResistance{ get{ return 15; } } + public override int BasePhysicalResistance => 15; - public override int InitMinHits{ get{ return 255; } } - public override int InitMaxHits{ get{ return 255; } } + public override int InitMinHits => 255; + public override int InitMaxHits => 255; [Constructible] public Aegis() @@ -33,7 +33,7 @@ namespace Server.Items writer.Write( (int) 1 ); } - + public override void Deserialize(GenericReader reader) { base.Deserialize( reader ); @@ -44,4 +44,4 @@ namespace Server.Items PhysicalBonus = 0; } } -} \ No newline at end of file +} diff --git a/Scripts/Items/Shields/Artifacts/ArcaneShield.cs b/Scripts/Items/Shields/Artifacts/ArcaneShield.cs index 2a161ef33..23b1538d1 100644 --- a/Scripts/Items/Shields/Artifacts/ArcaneShield.cs +++ b/Scripts/Items/Shields/Artifacts/ArcaneShield.cs @@ -5,11 +5,11 @@ namespace Server.Items { public class ArcaneShield : WoodenKiteShield { - public override int LabelNumber{ get{ return 1061101; } } // Arcane Shield - public override int ArtifactRarity{ get{ return 11; } } + public override int LabelNumber => 1061101; // Arcane Shield + public override int ArtifactRarity => 11; - public override int InitMinHits{ get{ return 255; } } - public override int InitMaxHits{ get{ return 255; } } + public override int InitMinHits => 255; + public override int InitMaxHits => 255; [Constructible] public ArcaneShield() @@ -32,7 +32,7 @@ namespace Server.Items writer.Write( (int) 0 ); } - + public override void Deserialize(GenericReader reader) { base.Deserialize( reader ); @@ -43,4 +43,4 @@ namespace Server.Items Attributes.NightSight = 1; } } -} \ No newline at end of file +} diff --git a/Scripts/Items/Shields/BaseShield.cs b/Scripts/Items/Shields/BaseShield.cs index 8f7411fbc..bd5db7cc3 100644 --- a/Scripts/Items/Shields/BaseShield.cs +++ b/Scripts/Items/Shields/BaseShield.cs @@ -7,7 +7,7 @@ namespace Server.Items { public class BaseShield : BaseArmor { - public override ArmorMaterialType MaterialType{ get{ return ArmorMaterialType.Plate; } } + public override ArmorMaterialType MaterialType => ArmorMaterialType.Plate; public BaseShield( int itemID ) : base( itemID ) { @@ -125,11 +125,11 @@ namespace Server.Items if( chance < 0.01 ) chance = 0.01; /* - FORMULA: Displayed AR = ((Parrying Skill * Base AR of Shield) ÷ 200) + 1 + FORMULA: Displayed AR = ((Parrying Skill * Base AR of Shield) � 200) + 1 FORMULA: % Chance of Blocking = parry skill - (shieldAR * 2) - FORMULA: Melee Damage Absorbed = (AR of Shield) / 2 | Archery Damage Absorbed = AR of Shield + FORMULA: Melee Damage Absorbed = (AR of Shield) / 2 | Archery Damage Absorbed = AR of Shield */ if( owner.CheckSkill( SkillName.Parry, chance ) ) { diff --git a/Scripts/Items/Shields/BronzeShield.cs b/Scripts/Items/Shields/BronzeShield.cs index cd61d37e7..efae58132 100644 --- a/Scripts/Items/Shields/BronzeShield.cs +++ b/Scripts/Items/Shields/BronzeShield.cs @@ -5,18 +5,18 @@ namespace Server.Items { public class BronzeShield : BaseShield { - public override int BasePhysicalResistance{ get{ return 0; } } - public override int BaseFireResistance{ get{ return 0; } } - public override int BaseColdResistance{ get{ return 1; } } - public override int BasePoisonResistance{ get{ return 0; } } - public override int BaseEnergyResistance{ get{ return 0; } } + public override int BasePhysicalResistance => 0; + public override int BaseFireResistance => 0; + public override int BaseColdResistance => 1; + public override int BasePoisonResistance => 0; + public override int BaseEnergyResistance => 0; - public override int InitMinHits{ get{ return 25; } } - public override int InitMaxHits{ get{ return 30; } } + public override int InitMinHits => 25; + public override int InitMaxHits => 30; - public override int AosStrReq{ get{ return 35; } } + public override int AosStrReq => 35; - public override int ArmorBase{ get{ return 10; } } + public override int ArmorBase => 10; [Constructible] public BronzeShield() : base( 0x1B72 ) diff --git a/Scripts/Items/Shields/Buckler.cs b/Scripts/Items/Shields/Buckler.cs index a2cf33c3d..b48a9ca47 100644 --- a/Scripts/Items/Shields/Buckler.cs +++ b/Scripts/Items/Shields/Buckler.cs @@ -5,18 +5,18 @@ namespace Server.Items { public class Buckler : BaseShield { - public override int BasePhysicalResistance{ get{ return 0; } } - public override int BaseFireResistance{ get{ return 0; } } - public override int BaseColdResistance{ get{ return 0; } } - public override int BasePoisonResistance{ get{ return 1; } } - public override int BaseEnergyResistance{ get{ return 0; } } + public override int BasePhysicalResistance => 0; + public override int BaseFireResistance => 0; + public override int BaseColdResistance => 0; + public override int BasePoisonResistance => 1; + public override int BaseEnergyResistance => 0; - public override int InitMinHits{ get{ return 40; } } - public override int InitMaxHits{ get{ return 50; } } + public override int InitMinHits => 40; + public override int InitMaxHits => 50; - public override int AosStrReq{ get{ return 20; } } + public override int AosStrReq => 20; - public override int ArmorBase{ get{ return 7; } } + public override int ArmorBase => 7; [Constructible] public Buckler() : base( 0x1B73 ) diff --git a/Scripts/Items/Shields/ChaosShield.cs b/Scripts/Items/Shields/ChaosShield.cs index 65bc92fbf..b36cfd1ce 100644 --- a/Scripts/Items/Shields/ChaosShield.cs +++ b/Scripts/Items/Shields/ChaosShield.cs @@ -6,18 +6,18 @@ namespace Server.Items { public class ChaosShield : BaseShield { - public override int BasePhysicalResistance{ get{ return 1; } } - public override int BaseFireResistance{ get{ return 0; } } - public override int BaseColdResistance{ get{ return 0; } } - public override int BasePoisonResistance{ get{ return 0; } } - public override int BaseEnergyResistance{ get{ return 0; } } + public override int BasePhysicalResistance => 1; + public override int BaseFireResistance => 0; + public override int BaseColdResistance => 0; + public override int BasePoisonResistance => 0; + public override int BaseEnergyResistance => 0; - public override int InitMinHits{ get{ return 100; } } - public override int InitMaxHits{ get{ return 125; } } + public override int InitMinHits => 100; + public override int InitMaxHits => 125; - public override int AosStrReq{ get{ return 95; } } + public override int AosStrReq => 95; - public override int ArmorBase{ get{ return 32; } } + public override int ArmorBase => 32; [Constructible] public ChaosShield() : base( 0x1BC3 ) @@ -75,4 +75,4 @@ namespace Server.Items return true; } } -} \ No newline at end of file +} diff --git a/Scripts/Items/Shields/HeaterShield.cs b/Scripts/Items/Shields/HeaterShield.cs index ac41048fd..c00e18b7b 100644 --- a/Scripts/Items/Shields/HeaterShield.cs +++ b/Scripts/Items/Shields/HeaterShield.cs @@ -5,18 +5,18 @@ namespace Server.Items { public class HeaterShield : BaseShield { - public override int BasePhysicalResistance{ get{ return 0; } } - public override int BaseFireResistance{ get{ return 1; } } - public override int BaseColdResistance{ get{ return 0; } } - public override int BasePoisonResistance{ get{ return 0; } } - public override int BaseEnergyResistance{ get{ return 0; } } + public override int BasePhysicalResistance => 0; + public override int BaseFireResistance => 1; + public override int BaseColdResistance => 0; + public override int BasePoisonResistance => 0; + public override int BaseEnergyResistance => 0; - public override int InitMinHits{ get{ return 50; } } - public override int InitMaxHits{ get{ return 65; } } + public override int InitMinHits => 50; + public override int InitMaxHits => 65; - public override int AosStrReq{ get{ return 90; } } + public override int AosStrReq => 90; - public override int ArmorBase{ get{ return 23; } } + public override int ArmorBase => 23; [Constructible] public HeaterShield() : base( 0x1B76 ) diff --git a/Scripts/Items/Shields/MetalKiteShield.cs b/Scripts/Items/Shields/MetalKiteShield.cs index 78e8eff1d..63eff68b9 100644 --- a/Scripts/Items/Shields/MetalKiteShield.cs +++ b/Scripts/Items/Shields/MetalKiteShield.cs @@ -5,18 +5,18 @@ namespace Server.Items { public class MetalKiteShield : BaseShield, IDyable { - public override int BasePhysicalResistance{ get{ return 0; } } - public override int BaseFireResistance{ get{ return 0; } } - public override int BaseColdResistance{ get{ return 0; } } - public override int BasePoisonResistance{ get{ return 0; } } - public override int BaseEnergyResistance{ get{ return 1; } } + public override int BasePhysicalResistance => 0; + public override int BaseFireResistance => 0; + public override int BaseColdResistance => 0; + public override int BasePoisonResistance => 0; + public override int BaseEnergyResistance => 1; - public override int InitMinHits{ get{ return 45; } } - public override int InitMaxHits{ get{ return 60; } } + public override int InitMinHits => 45; + public override int InitMaxHits => 60; - public override int AosStrReq{ get{ return 45; } } + public override int AosStrReq => 45; - public override int ArmorBase{ get{ return 16; } } + public override int ArmorBase => 16; [Constructible] public MetalKiteShield() : base( 0x1B74 ) diff --git a/Scripts/Items/Shields/MetalShield.cs b/Scripts/Items/Shields/MetalShield.cs index 73bdf9ce8..71a6215aa 100644 --- a/Scripts/Items/Shields/MetalShield.cs +++ b/Scripts/Items/Shields/MetalShield.cs @@ -5,18 +5,18 @@ namespace Server.Items { public class MetalShield : BaseShield { - public override int BasePhysicalResistance{ get{ return 0; } } - public override int BaseFireResistance{ get{ return 1; } } - public override int BaseColdResistance{ get{ return 0; } } - public override int BasePoisonResistance{ get{ return 0; } } - public override int BaseEnergyResistance{ get{ return 0; } } + public override int BasePhysicalResistance => 0; + public override int BaseFireResistance => 1; + public override int BaseColdResistance => 0; + public override int BasePoisonResistance => 0; + public override int BaseEnergyResistance => 0; - public override int InitMinHits{ get{ return 50; } } - public override int InitMaxHits{ get{ return 65; } } + public override int InitMinHits => 50; + public override int InitMaxHits => 65; - public override int AosStrReq{ get{ return 45; } } + public override int AosStrReq => 45; - public override int ArmorBase{ get{ return 11; } } + public override int ArmorBase => 11; [Constructible] public MetalShield() : base( 0x1B7B ) diff --git a/Scripts/Items/Shields/OrderShield.cs b/Scripts/Items/Shields/OrderShield.cs index f5fc20acb..ce675d04f 100644 --- a/Scripts/Items/Shields/OrderShield.cs +++ b/Scripts/Items/Shields/OrderShield.cs @@ -6,18 +6,18 @@ namespace Server.Items { public class OrderShield : BaseShield { - public override int BasePhysicalResistance{ get{ return 1; } } - public override int BaseFireResistance{ get{ return 0; } } - public override int BaseColdResistance{ get{ return 0; } } - public override int BasePoisonResistance{ get{ return 0; } } - public override int BaseEnergyResistance{ get{ return 0; } } + public override int BasePhysicalResistance => 1; + public override int BaseFireResistance => 0; + public override int BaseColdResistance => 0; + public override int BasePoisonResistance => 0; + public override int BaseEnergyResistance => 0; - public override int InitMinHits{ get{ return 100; } } - public override int InitMaxHits{ get{ return 125; } } + public override int InitMinHits => 100; + public override int InitMaxHits => 125; - public override int AosStrReq{ get{ return 95; } } + public override int AosStrReq => 95; - public override int ArmorBase{ get{ return 30; } } + public override int ArmorBase => 30; [Constructible] public OrderShield() : base( 0x1BC4 ) @@ -78,4 +78,4 @@ namespace Server.Items return true; } } -} \ No newline at end of file +} diff --git a/Scripts/Items/Shields/WoodenKiteShield.cs b/Scripts/Items/Shields/WoodenKiteShield.cs index 4df15f848..0fed847d1 100644 --- a/Scripts/Items/Shields/WoodenKiteShield.cs +++ b/Scripts/Items/Shields/WoodenKiteShield.cs @@ -5,18 +5,18 @@ namespace Server.Items { public class WoodenKiteShield : BaseShield { - public override int BasePhysicalResistance{ get{ return 0; } } - public override int BaseFireResistance{ get{ return 0; } } - public override int BaseColdResistance{ get{ return 0; } } - public override int BasePoisonResistance{ get{ return 0; } } - public override int BaseEnergyResistance{ get{ return 1; } } + public override int BasePhysicalResistance => 0; + public override int BaseFireResistance => 0; + public override int BaseColdResistance => 0; + public override int BasePoisonResistance => 0; + public override int BaseEnergyResistance => 1; - public override int InitMinHits{ get{ return 50; } } - public override int InitMaxHits{ get{ return 65; } } + public override int InitMinHits => 50; + public override int InitMaxHits => 65; - public override int AosStrReq{ get{ return 20; } } + public override int AosStrReq => 20; - public override int ArmorBase{ get{ return 12; } } + public override int ArmorBase => 12; [Constructible] public WoodenKiteShield() : base( 0x1B79 ) diff --git a/Scripts/Items/Shields/WoodenShield.cs b/Scripts/Items/Shields/WoodenShield.cs index ab1b08ad3..7231be415 100644 --- a/Scripts/Items/Shields/WoodenShield.cs +++ b/Scripts/Items/Shields/WoodenShield.cs @@ -5,18 +5,18 @@ namespace Server.Items { public class WoodenShield : BaseShield { - public override int BasePhysicalResistance{ get{ return 0; } } - public override int BaseFireResistance{ get{ return 0; } } - public override int BaseColdResistance{ get{ return 0; } } - public override int BasePoisonResistance{ get{ return 0; } } - public override int BaseEnergyResistance{ get{ return 1; } } + public override int BasePhysicalResistance => 0; + public override int BaseFireResistance => 0; + public override int BaseColdResistance => 0; + public override int BasePoisonResistance => 0; + public override int BaseEnergyResistance => 1; - public override int InitMinHits{ get{ return 20; } } - public override int InitMaxHits{ get{ return 25; } } + public override int InitMinHits => 20; + public override int InitMaxHits => 25; - public override int AosStrReq{ get{ return 20; } } + public override int AosStrReq => 20; - public override int ArmorBase{ get{ return 8; } } + public override int ArmorBase => 8; [Constructible] public WoodenShield() : base( 0x1B7A ) diff --git a/Scripts/Items/Skill Items/Carpenter Items/TaxidermyKit.cs b/Scripts/Items/Skill Items/Carpenter Items/TaxidermyKit.cs index 97e294171..b911dabf5 100644 --- a/Scripts/Items/Skill Items/Carpenter Items/TaxidermyKit.cs +++ b/Scripts/Items/Skill Items/Carpenter Items/TaxidermyKit.cs @@ -9,7 +9,7 @@ namespace Server.Items [FlippableAttribute( 0x1EBA, 0x1EBB )] public class TaxidermyKit : Item { - public override int LabelNumber{ get{ return 1041279; } } // a taxidermy kit + public override int LabelNumber => 1041279; // a taxidermy kit [Constructible] public TaxidermyKit() : base( 0x1EBA ) @@ -78,10 +78,10 @@ namespace Server.Items private int m_DeedNumber; private int m_AddonNumber; - public Type CreatureType { get { return m_CreatureType; } } - public int NorthID { get { return m_NorthID; } } - public int DeedNumber { get { return m_DeedNumber; } } - public int AddonNumber { get { return m_AddonNumber; } } + public Type CreatureType => m_CreatureType; + public int NorthID => m_NorthID; + public int DeedNumber => m_DeedNumber; + public int AddonNumber => m_AddonNumber; } @@ -174,7 +174,7 @@ namespace Server.Items public class TrophyAddon : Item, IAddon { - public override bool ForceShowProperties { get { return ObjectPropertyList.Enabled; } } + public override bool ForceShowProperties => ObjectPropertyList.Enabled; private int m_WestID; private int m_NorthID; @@ -202,7 +202,7 @@ namespace Server.Items [CommandProperty( AccessLevel.GameMaster )] public int AnimalWeight{ get{ return m_AnimalWeight; } set{ m_AnimalWeight = value; InvalidateProperties(); } } - public override int LabelNumber{ get{ return m_AddonNumber; } } + public override int LabelNumber => m_AddonNumber; [Constructible] public TrophyAddon( Mobile from, int itemID, int westID, int northID, int deedNumber, int addonNumber ) : this( from, itemID, westID, northID, deedNumber, addonNumber, null, 0 ) @@ -370,7 +370,7 @@ namespace Server.Items [CommandProperty( AccessLevel.GameMaster )] public int AnimalWeight{ get{ return m_AnimalWeight; } set{ m_AnimalWeight = value; InvalidateProperties(); } } - public override int LabelNumber{ get{ return m_DeedNumber; } } + public override int LabelNumber => m_DeedNumber; [Constructible] public TrophyDeed( int westID, int northID, int deedNumber, int addonNumber ) : this( westID, northID, deedNumber, addonNumber, null, 0 ) @@ -499,4 +499,4 @@ namespace Server.Items } } } -} \ No newline at end of file +} diff --git a/Scripts/Items/Skill Items/Fishing/Misc/MessageInABottle.cs b/Scripts/Items/Skill Items/Fishing/Misc/MessageInABottle.cs index 21709d3fd..53602f50e 100644 --- a/Scripts/Items/Skill Items/Fishing/Misc/MessageInABottle.cs +++ b/Scripts/Items/Skill Items/Fishing/Misc/MessageInABottle.cs @@ -14,7 +14,7 @@ namespace Server.Items return Utility.RandomMinMax( 1, 3 ); } - public override int LabelNumber{ get{ return 1041080; } } // a message in a bottle + public override int LabelNumber => 1041080; // a message in a bottle private Map m_TargetMap; private int m_Level; @@ -111,4 +111,4 @@ namespace Server.Items } } } -} \ No newline at end of file +} diff --git a/Scripts/Items/Skill Items/Fishing/Misc/SpecialFishingNet.cs b/Scripts/Items/Skill Items/Fishing/Misc/SpecialFishingNet.cs index 2a75008f6..d6dd0fd8d 100644 --- a/Scripts/Items/Skill Items/Fishing/Misc/SpecialFishingNet.cs +++ b/Scripts/Items/Skill Items/Fishing/Misc/SpecialFishingNet.cs @@ -9,7 +9,7 @@ namespace Server.Items { public class SpecialFishingNet : Item { - public override int LabelNumber{ get{ return 1041079; } } // a special fishing net + public override int LabelNumber => 1041079; // a special fishing net private bool m_InUse; @@ -364,7 +364,7 @@ namespace Server.Items public class FabledFishingNet : SpecialFishingNet { - public override int LabelNumber{ get{ return 1063451; } } // a fabled fishing net + public override int LabelNumber => 1063451; // a fabled fishing net [Constructible] public FabledFishingNet() @@ -406,4 +406,4 @@ namespace Server.Items int version = reader.ReadInt(); } } -} \ No newline at end of file +} diff --git a/Scripts/Items/Skill Items/Harvest Tools/GargoylesPickaxe.cs b/Scripts/Items/Skill Items/Harvest Tools/GargoylesPickaxe.cs index 9ecc6c756..0b04636d0 100644 --- a/Scripts/Items/Skill Items/Harvest Tools/GargoylesPickaxe.cs +++ b/Scripts/Items/Skill Items/Harvest Tools/GargoylesPickaxe.cs @@ -6,27 +6,27 @@ namespace Server.Items { public class GargoylesPickaxe : BaseAxe, IUsesRemaining { - public override int LabelNumber{ get{ return 1041281; } } // a gargoyle's pickaxe - public override HarvestSystem HarvestSystem{ get{ return Mining.System; } } + public override int LabelNumber => 1041281; // a gargoyle's pickaxe + public override HarvestSystem HarvestSystem => Mining.System; - public override WeaponAbility PrimaryAbility{ get{ return WeaponAbility.DoubleStrike; } } - public override WeaponAbility SecondaryAbility{ get{ return WeaponAbility.Disarm; } } + public override WeaponAbility PrimaryAbility => WeaponAbility.DoubleStrike; + public override WeaponAbility SecondaryAbility => WeaponAbility.Disarm; - public override int AosStrengthReq{ get{ return 50; } } - public override int AosMinDamage{ get{ return 13; } } - public override int AosMaxDamage{ get{ return 15; } } - public override int AosSpeed{ get{ return 35; } } - public override float MlSpeed{ get{ return 3.00f; } } + public override int AosStrengthReq => 50; + public override int AosMinDamage => 13; + public override int AosMaxDamage => 15; + public override int AosSpeed => 35; + public override float MlSpeed => 3.00f; - public override int OldStrengthReq{ get{ return 25; } } - public override int OldMinDamage{ get{ return 1; } } - public override int OldMaxDamage{ get{ return 15; } } - public override int OldSpeed{ get{ return 35; } } - - public override int InitMinHits{ get{ return 31; } } - public override int InitMaxHits{ get{ return 60; } } + public override int OldStrengthReq => 25; + public override int OldMinDamage => 1; + public override int OldMaxDamage => 15; + public override int OldSpeed => 35; - public override WeaponAnimation DefAnimation{ get{ return WeaponAnimation.Slash1H; } } + public override int InitMinHits => 31; + public override int InitMaxHits => 60; + + public override WeaponAnimation DefAnimation => WeaponAnimation.Slash1H; [Constructible] public GargoylesPickaxe() : this( Utility.RandomMinMax( 101, 125 )) @@ -57,9 +57,9 @@ namespace Server.Items base.Deserialize( reader ); int version = reader.ReadInt(); - + if ( Hue == 0x973 ) Hue = 0x0; } } -} \ No newline at end of file +} diff --git a/Scripts/Items/Skill Items/Harvest Tools/ProspectorsTool.cs b/Scripts/Items/Skill Items/Harvest Tools/ProspectorsTool.cs index 1a666c5da..32c2024cd 100644 --- a/Scripts/Items/Skill Items/Harvest Tools/ProspectorsTool.cs +++ b/Scripts/Items/Skill Items/Harvest Tools/ProspectorsTool.cs @@ -18,20 +18,20 @@ namespace Server.Items public bool ShowUsesRemaining{ get{ return true; } set{} } - public override int LabelNumber{ get{ return 1049065; } } // prospector's tool + public override int LabelNumber => 1049065; // prospector's tool - public override WeaponAbility PrimaryAbility{ get{ return WeaponAbility.CrushingBlow; } } - public override WeaponAbility SecondaryAbility{ get{ return WeaponAbility.ShadowStrike; } } + public override WeaponAbility PrimaryAbility => WeaponAbility.CrushingBlow; + public override WeaponAbility SecondaryAbility => WeaponAbility.ShadowStrike; - public override int AosStrengthReq{ get{ return 40; } } - public override int AosMinDamage{ get{ return 13; } } - public override int AosMaxDamage{ get{ return 15; } } - public override int AosSpeed{ get{ return 33; } } + public override int AosStrengthReq => 40; + public override int AosMinDamage => 13; + public override int AosMaxDamage => 15; + public override int AosSpeed => 33; - public override int OldStrengthReq{ get{ return 10; } } - public override int OldMinDamage{ get{ return 6; } } - public override int OldMaxDamage{ get{ return 8; } } - public override int OldSpeed{ get{ return 33; } } + public override int OldStrengthReq => 10; + public override int OldMinDamage => 6; + public override int OldMaxDamage => 8; + public override int OldSpeed => 33; [Constructible] public ProspectorsTool() : base( 0xFB4 ) @@ -170,4 +170,4 @@ namespace Server.Items } } } -} \ No newline at end of file +} diff --git a/Scripts/Items/Skill Items/Harvest Tools/Shovel.cs b/Scripts/Items/Skill Items/Harvest Tools/Shovel.cs index 80f560f2c..170035ef4 100644 --- a/Scripts/Items/Skill Items/Harvest Tools/Shovel.cs +++ b/Scripts/Items/Skill Items/Harvest Tools/Shovel.cs @@ -6,7 +6,7 @@ namespace Server.Items { public class Shovel : BaseHarvestTool { - public override HarvestSystem HarvestSystem{ get{ return Mining.System; } } + public override HarvestSystem HarvestSystem => Mining.System; [Constructible] public Shovel() : this( 50 ) @@ -37,4 +37,4 @@ namespace Server.Items int version = reader.ReadInt(); } } -} \ No newline at end of file +} diff --git a/Scripts/Items/Skill Items/Harvest Tools/SturdyPickaxe.cs b/Scripts/Items/Skill Items/Harvest Tools/SturdyPickaxe.cs index 01b645ea0..56be71579 100644 --- a/Scripts/Items/Skill Items/Harvest Tools/SturdyPickaxe.cs +++ b/Scripts/Items/Skill Items/Harvest Tools/SturdyPickaxe.cs @@ -6,24 +6,24 @@ namespace Server.Items { public class SturdyPickaxe : BaseAxe, IUsesRemaining { - public override int LabelNumber{ get{ return 1045126; } } // sturdy pickaxe - public override HarvestSystem HarvestSystem{ get{ return Mining.System; } } + public override int LabelNumber => 1045126; // sturdy pickaxe + public override HarvestSystem HarvestSystem => Mining.System; - public override WeaponAbility PrimaryAbility{ get{ return WeaponAbility.DoubleStrike; } } - public override WeaponAbility SecondaryAbility{ get{ return WeaponAbility.Disarm; } } + public override WeaponAbility PrimaryAbility => WeaponAbility.DoubleStrike; + public override WeaponAbility SecondaryAbility => WeaponAbility.Disarm; - public override int AosStrengthReq{ get{ return 50; } } - public override int AosMinDamage{ get{ return 13; } } - public override int AosMaxDamage{ get{ return 15; } } - public override int AosSpeed{ get{ return 35; } } - public override float MlSpeed{ get{ return 3.00f; } } + public override int AosStrengthReq => 50; + public override int AosMinDamage => 13; + public override int AosMaxDamage => 15; + public override int AosSpeed => 35; + public override float MlSpeed => 3.00f; - public override int OldStrengthReq{ get{ return 25; } } - public override int OldMinDamage{ get{ return 1; } } - public override int OldMaxDamage{ get{ return 15; } } - public override int OldSpeed{ get{ return 35; } } + public override int OldStrengthReq => 25; + public override int OldMinDamage => 1; + public override int OldMaxDamage => 15; + public override int OldSpeed => 35; - public override WeaponAnimation DefAnimation{ get{ return WeaponAnimation.Slash1H; } } + public override WeaponAnimation DefAnimation => WeaponAnimation.Slash1H; [Constructible] public SturdyPickaxe() : this( 180 ) @@ -57,4 +57,4 @@ namespace Server.Items int version = reader.ReadInt(); } } -} \ No newline at end of file +} diff --git a/Scripts/Items/Skill Items/Harvest Tools/SturdyShovel.cs b/Scripts/Items/Skill Items/Harvest Tools/SturdyShovel.cs index 60f1d5429..57a2f3b5e 100644 --- a/Scripts/Items/Skill Items/Harvest Tools/SturdyShovel.cs +++ b/Scripts/Items/Skill Items/Harvest Tools/SturdyShovel.cs @@ -6,8 +6,8 @@ namespace Server.Items { public class SturdyShovel : BaseHarvestTool { - public override int LabelNumber{ get{ return 1045125; } } // sturdy shovel - public override HarvestSystem HarvestSystem{ get{ return Mining.System; } } + public override int LabelNumber => 1045125; // sturdy shovel + public override HarvestSystem HarvestSystem => Mining.System; [Constructible] public SturdyShovel() : this( 180 ) @@ -39,4 +39,4 @@ namespace Server.Items int version = reader.ReadInt(); } } -} \ No newline at end of file +} diff --git a/Scripts/Items/Skill Items/Magical/BookOfBushido.cs b/Scripts/Items/Skill Items/Magical/BookOfBushido.cs index fefc0af7a..84c9982f1 100644 --- a/Scripts/Items/Skill Items/Magical/BookOfBushido.cs +++ b/Scripts/Items/Skill Items/Magical/BookOfBushido.cs @@ -6,9 +6,9 @@ namespace Server.Items { public class BookOfBushido : Spellbook { - public override SpellbookType SpellbookType{ get{ return SpellbookType.Samurai; } } - public override int BookOffset{ get{ return 400; } } - public override int BookCount{ get{ return 6; } } + public override SpellbookType SpellbookType => SpellbookType.Samurai; + public override int BookOffset => 400; + public override int BookCount => 6; [Constructible] public BookOfBushido() : this( (ulong)0x3F ) @@ -42,4 +42,4 @@ namespace Server.Items Layer = Layer.OneHanded; } } -} \ No newline at end of file +} diff --git a/Scripts/Items/Skill Items/Magical/BookOfChivalry.cs b/Scripts/Items/Skill Items/Magical/BookOfChivalry.cs index 0c9826fb6..62636f4ad 100644 --- a/Scripts/Items/Skill Items/Magical/BookOfChivalry.cs +++ b/Scripts/Items/Skill Items/Magical/BookOfChivalry.cs @@ -6,9 +6,9 @@ namespace Server.Items { public class BookOfChivalry : Spellbook { - public override SpellbookType SpellbookType{ get{ return SpellbookType.Paladin; } } - public override int BookOffset{ get{ return 200; } } - public override int BookCount{ get{ return 10; } } + public override SpellbookType SpellbookType => SpellbookType.Paladin; + public override int BookOffset => 200; + public override int BookCount => 10; [Constructible] public BookOfChivalry() : this( (ulong)0x3FF ) @@ -42,4 +42,4 @@ namespace Server.Items Layer = Layer.OneHanded; } } -} \ No newline at end of file +} diff --git a/Scripts/Items/Skill Items/Magical/BookOfNinjitsu.cs b/Scripts/Items/Skill Items/Magical/BookOfNinjitsu.cs index 56839b138..c4b24fad9 100644 --- a/Scripts/Items/Skill Items/Magical/BookOfNinjitsu.cs +++ b/Scripts/Items/Skill Items/Magical/BookOfNinjitsu.cs @@ -6,9 +6,9 @@ namespace Server.Items { public class BookOfNinjitsu : Spellbook { - public override SpellbookType SpellbookType{ get{ return SpellbookType.Ninja; } } - public override int BookOffset{ get{ return 500; } } - public override int BookCount{ get{ return 8; } } + public override SpellbookType SpellbookType => SpellbookType.Ninja; + public override int BookOffset => 500; + public override int BookCount => 8; [Constructible] @@ -43,4 +43,4 @@ namespace Server.Items Layer = Layer.OneHanded; } } -} \ No newline at end of file +} diff --git a/Scripts/Items/Skill Items/Magical/MysticSpellbook.cs b/Scripts/Items/Skill Items/Magical/MysticSpellbook.cs index 1f27a02bf..6ae6dc9ed 100644 --- a/Scripts/Items/Skill Items/Magical/MysticSpellbook.cs +++ b/Scripts/Items/Skill Items/Magical/MysticSpellbook.cs @@ -4,10 +4,10 @@ namespace Server.Items { public class MysticSpellbook : Spellbook { - public override SpellbookType SpellbookType { get { return SpellbookType.Mystic; } } + public override SpellbookType SpellbookType => SpellbookType.Mystic; - public override int BookOffset { get { return 677; } } - public override int BookCount { get { return 16; } } + public override int BookOffset => 677; + public override int BookCount => 16; [Constructible] public MysticSpellbook() diff --git a/Scripts/Items/Skill Items/Magical/NecromancerSpellbook.cs b/Scripts/Items/Skill Items/Magical/NecromancerSpellbook.cs index 1f1f580e9..d29c7e695 100644 --- a/Scripts/Items/Skill Items/Magical/NecromancerSpellbook.cs +++ b/Scripts/Items/Skill Items/Magical/NecromancerSpellbook.cs @@ -6,9 +6,9 @@ namespace Server.Items { public class NecromancerSpellbook : Spellbook { - public override SpellbookType SpellbookType{ get{ return SpellbookType.Necromancer; } } - public override int BookOffset{ get{ return 100; } } - public override int BookCount{ get{ return ((Core.SE) ? 17 : 16); } } + public override SpellbookType SpellbookType => SpellbookType.Necromancer; + public override int BookOffset => 100; + public override int BookCount => ((Core.SE) ? 17 : 16); [Constructible] public NecromancerSpellbook() : this( (ulong)0 ) @@ -42,4 +42,4 @@ namespace Server.Items Layer = Layer.OneHanded; } } -} \ No newline at end of file +} diff --git a/Scripts/Items/Skill Items/Magical/Potions/Agility Potions/AgilityPotion.cs b/Scripts/Items/Skill Items/Magical/Potions/Agility Potions/AgilityPotion.cs index 45a0b0b9c..a7282e7ed 100644 --- a/Scripts/Items/Skill Items/Magical/Potions/Agility Potions/AgilityPotion.cs +++ b/Scripts/Items/Skill Items/Magical/Potions/Agility Potions/AgilityPotion.cs @@ -5,8 +5,8 @@ namespace Server.Items { public class AgilityPotion : BaseAgilityPotion { - public override int DexOffset{ get{ return 10; } } - public override TimeSpan Duration{ get{ return TimeSpan.FromMinutes( 2.0 ); } } + public override int DexOffset => 10; + public override TimeSpan Duration => TimeSpan.FromMinutes( 2.0 ); [Constructible] public AgilityPotion() : base( PotionEffect.Agility ) @@ -31,4 +31,4 @@ namespace Server.Items int version = reader.ReadInt(); } } -} \ No newline at end of file +} diff --git a/Scripts/Items/Skill Items/Magical/Potions/Agility Potions/GreaterAgilityPotion.cs b/Scripts/Items/Skill Items/Magical/Potions/Agility Potions/GreaterAgilityPotion.cs index da0e096d6..74be24a2d 100644 --- a/Scripts/Items/Skill Items/Magical/Potions/Agility Potions/GreaterAgilityPotion.cs +++ b/Scripts/Items/Skill Items/Magical/Potions/Agility Potions/GreaterAgilityPotion.cs @@ -5,8 +5,8 @@ namespace Server.Items { public class GreaterAgilityPotion : BaseAgilityPotion { - public override int DexOffset{ get{ return 20; } } - public override TimeSpan Duration{ get{ return TimeSpan.FromMinutes( 2.0 ); } } + public override int DexOffset => 20; + public override TimeSpan Duration => TimeSpan.FromMinutes( 2.0 ); [Constructible] public GreaterAgilityPotion() : base( PotionEffect.AgilityGreater ) @@ -31,4 +31,4 @@ namespace Server.Items int version = reader.ReadInt(); } } -} \ No newline at end of file +} diff --git a/Scripts/Items/Skill Items/Magical/Potions/BasePotion.cs b/Scripts/Items/Skill Items/Magical/Potions/BasePotion.cs index 4fc93830c..5a06650b7 100644 --- a/Scripts/Items/Skill Items/Magical/Potions/BasePotion.cs +++ b/Scripts/Items/Skill Items/Magical/Potions/BasePotion.cs @@ -58,7 +58,7 @@ namespace Server.Items int ICommodity.DescriptionNumber { get { return LabelNumber; } } bool ICommodity.IsDeedable { get { return (Core.ML); } } - public override int LabelNumber{ get{ return 1041314 + (int)m_PotionEffect; } } + public override int LabelNumber => 1041314 + (int)m_PotionEffect; public BasePotion( int itemID, PotionEffect effect ) : base( itemID ) { @@ -84,7 +84,7 @@ namespace Server.Items if ( handTwo is BaseRanged ) { BaseRanged ranged = (BaseRanged) handTwo; - + if ( ranged.Balanced ) return true; } diff --git a/Scripts/Items/Skill Items/Magical/Potions/Conflagration Potions/ConflagrationPotion.cs b/Scripts/Items/Skill Items/Magical/Potions/Conflagration Potions/ConflagrationPotion.cs index d7adb0df8..8b54e1d07 100644 --- a/Scripts/Items/Skill Items/Magical/Potions/Conflagration Potions/ConflagrationPotion.cs +++ b/Scripts/Items/Skill Items/Magical/Potions/Conflagration Potions/ConflagrationPotion.cs @@ -5,10 +5,10 @@ namespace Server.Items { public class ConflagrationPotion : BaseConflagrationPotion { - public override int MinDamage{ get{ return 2; } } - public override int MaxDamage{ get{ return 4; } } + public override int MinDamage => 2; + public override int MaxDamage => 4; - public override int LabelNumber{ get{ return 1072095; } } // a Conflagration potion + public override int LabelNumber => 1072095; // a Conflagration potion [Constructible] public ConflagrationPotion() : base( PotionEffect.Conflagration ) diff --git a/Scripts/Items/Skill Items/Magical/Potions/Conflagration Potions/GreaterConflagrationPotion.cs b/Scripts/Items/Skill Items/Magical/Potions/Conflagration Potions/GreaterConflagrationPotion.cs index 95f9ff1e6..a2c697c90 100644 --- a/Scripts/Items/Skill Items/Magical/Potions/Conflagration Potions/GreaterConflagrationPotion.cs +++ b/Scripts/Items/Skill Items/Magical/Potions/Conflagration Potions/GreaterConflagrationPotion.cs @@ -5,10 +5,10 @@ namespace Server.Items { public class GreaterConflagrationPotion : BaseConflagrationPotion { - public override int MinDamage{ get{ return 4; } } - public override int MaxDamage{ get{ return 8; } } + public override int MinDamage => 4; + public override int MaxDamage => 8; - public override int LabelNumber{ get{ return 1072098; } } // a Greater Conflagration potion + public override int LabelNumber => 1072098; // a Greater Conflagration potion [Constructible] public GreaterConflagrationPotion() : base( PotionEffect.ConflagrationGreater ) diff --git a/Scripts/Items/Skill Items/Magical/Potions/Confusion Blast Potions/ConfusionBlastPotion.cs b/Scripts/Items/Skill Items/Magical/Potions/Confusion Blast Potions/ConfusionBlastPotion.cs index e3aacdb5b..3a8893131 100644 --- a/Scripts/Items/Skill Items/Magical/Potions/Confusion Blast Potions/ConfusionBlastPotion.cs +++ b/Scripts/Items/Skill Items/Magical/Potions/Confusion Blast Potions/ConfusionBlastPotion.cs @@ -5,9 +5,9 @@ namespace Server.Items { public class ConfusionBlastPotion : BaseConfusionBlastPotion { - public override int Radius{ get{ return 5; } } + public override int Radius => 5; - public override int LabelNumber{ get{ return 1072105; } } // a Confusion Blast potion + public override int LabelNumber => 1072105; // a Confusion Blast potion [Constructible] public ConfusionBlastPotion() : base( PotionEffect.ConfusionBlast ) diff --git a/Scripts/Items/Skill Items/Magical/Potions/Confusion Blast Potions/GreaterConfusionBlastPotion.cs b/Scripts/Items/Skill Items/Magical/Potions/Confusion Blast Potions/GreaterConfusionBlastPotion.cs index 4f442665d..e462754b9 100644 --- a/Scripts/Items/Skill Items/Magical/Potions/Confusion Blast Potions/GreaterConfusionBlastPotion.cs +++ b/Scripts/Items/Skill Items/Magical/Potions/Confusion Blast Potions/GreaterConfusionBlastPotion.cs @@ -5,9 +5,9 @@ namespace Server.Items { public class GreaterConfusionBlastPotion : BaseConfusionBlastPotion { - public override int Radius{ get{ return 7; } } + public override int Radius => 7; - public override int LabelNumber{ get{ return 1072108; } } // a Greater Confusion Blast potion + public override int LabelNumber => 1072108; // a Greater Confusion Blast potion [Constructible] public GreaterConfusionBlastPotion() : base( PotionEffect.ConfusionBlastGreater ) diff --git a/Scripts/Items/Skill Items/Magical/Potions/Cure Potions/CurePotion.cs b/Scripts/Items/Skill Items/Magical/Potions/Cure Potions/CurePotion.cs index ea6fcf59e..61ab379a6 100644 --- a/Scripts/Items/Skill Items/Magical/Potions/Cure Potions/CurePotion.cs +++ b/Scripts/Items/Skill Items/Magical/Potions/Cure Potions/CurePotion.cs @@ -22,7 +22,7 @@ namespace Server.Items new CureLevelInfo( Poison.Lethal, 0.25 ) }; - public override CureLevelInfo[] LevelInfo{ get{ return Core.AOS ? m_AosLevelInfo : m_OldLevelInfo; } } + public override CureLevelInfo[] LevelInfo => Core.AOS ? m_AosLevelInfo : m_OldLevelInfo; [Constructible] public CurePotion() : base( PotionEffect.Cure ) @@ -47,4 +47,4 @@ namespace Server.Items int version = reader.ReadInt(); } } -} \ No newline at end of file +} diff --git a/Scripts/Items/Skill Items/Magical/Potions/Cure Potions/GreaterCurePotion.cs b/Scripts/Items/Skill Items/Magical/Potions/Cure Potions/GreaterCurePotion.cs index 5c5d04ab0..e2ce4ea27 100644 --- a/Scripts/Items/Skill Items/Magical/Potions/Cure Potions/GreaterCurePotion.cs +++ b/Scripts/Items/Skill Items/Magical/Potions/Cure Potions/GreaterCurePotion.cs @@ -23,7 +23,7 @@ namespace Server.Items new CureLevelInfo( Poison.Lethal, 0.75 ) }; - public override CureLevelInfo[] LevelInfo{ get{ return Core.AOS ? m_AosLevelInfo : m_OldLevelInfo; } } + public override CureLevelInfo[] LevelInfo => Core.AOS ? m_AosLevelInfo : m_OldLevelInfo; [Constructible] public GreaterCurePotion() : base( PotionEffect.CureGreater ) @@ -48,4 +48,4 @@ namespace Server.Items int version = reader.ReadInt(); } } -} \ No newline at end of file +} diff --git a/Scripts/Items/Skill Items/Magical/Potions/Cure Potions/LesserCurePotion.cs b/Scripts/Items/Skill Items/Magical/Potions/Cure Potions/LesserCurePotion.cs index 89c0be2ec..cbdd82f0a 100644 --- a/Scripts/Items/Skill Items/Magical/Potions/Cure Potions/LesserCurePotion.cs +++ b/Scripts/Items/Skill Items/Magical/Potions/Cure Potions/LesserCurePotion.cs @@ -19,7 +19,7 @@ namespace Server.Items new CureLevelInfo( Poison.Greater, 0.25 ) }; - public override CureLevelInfo[] LevelInfo{ get{ return Core.AOS ? m_AosLevelInfo : m_OldLevelInfo; } } + public override CureLevelInfo[] LevelInfo => Core.AOS ? m_AosLevelInfo : m_OldLevelInfo; [Constructible] public LesserCurePotion() : base( PotionEffect.CureLesser ) @@ -44,4 +44,4 @@ namespace Server.Items int version = reader.ReadInt(); } } -} \ No newline at end of file +} diff --git a/Scripts/Items/Skill Items/Magical/Potions/DarkglowPotion.cs b/Scripts/Items/Skill Items/Magical/Potions/DarkglowPotion.cs index 365551031..98600df00 100644 --- a/Scripts/Items/Skill Items/Magical/Potions/DarkglowPotion.cs +++ b/Scripts/Items/Skill Items/Magical/Potions/DarkglowPotion.cs @@ -5,12 +5,12 @@ namespace Server.Items { public class DarkglowPotion : BasePoisonPotion { - public override Poison Poison{ get{ return Poison.Greater; } } /* MUST be restored when prerequisites are done */ + public override Poison Poison => Poison.Greater; /* MUST be restored when prerequisites are done */ - public override double MinPoisoningSkill{ get{ return 95.0; } } - public override double MaxPoisoningSkill{ get{ return 100.0; } } - - public override int LabelNumber{ get{ return 1072849; } } // Darkglow Poison + public override double MinPoisoningSkill => 95.0; + public override double MaxPoisoningSkill => 100.0; + + public override int LabelNumber => 1072849; // Darkglow Poison [Constructible] public DarkglowPotion() : base( PotionEffect.Darkglow ) diff --git a/Scripts/Items/Skill Items/Magical/Potions/Explosion Potions/BaseExplosionPotion.cs b/Scripts/Items/Skill Items/Magical/Potions/Explosion Potions/BaseExplosionPotion.cs index 18deb21e2..e9c73725f 100644 --- a/Scripts/Items/Skill Items/Magical/Potions/Explosion Potions/BaseExplosionPotion.cs +++ b/Scripts/Items/Skill Items/Magical/Potions/Explosion Potions/BaseExplosionPotion.cs @@ -62,7 +62,7 @@ namespace Server.Items private Timer m_Timer; - public List Users { get { return m_Users; } } + public List Users => m_Users; private List m_Users; diff --git a/Scripts/Items/Skill Items/Magical/Potions/Explosion Potions/ExplosionPotion.cs b/Scripts/Items/Skill Items/Magical/Potions/Explosion Potions/ExplosionPotion.cs index 79927516b..25d401d43 100644 --- a/Scripts/Items/Skill Items/Magical/Potions/Explosion Potions/ExplosionPotion.cs +++ b/Scripts/Items/Skill Items/Magical/Potions/Explosion Potions/ExplosionPotion.cs @@ -5,8 +5,8 @@ namespace Server.Items { public class ExplosionPotion : BaseExplosionPotion { - public override int MinDamage { get { return 10; } } - public override int MaxDamage { get { return 20; } } + public override int MinDamage => 10; + public override int MaxDamage => 20; [Constructible] public ExplosionPotion() : base( PotionEffect.Explosion ) @@ -31,4 +31,4 @@ namespace Server.Items int version = reader.ReadInt(); } } -} \ No newline at end of file +} diff --git a/Scripts/Items/Skill Items/Magical/Potions/Explosion Potions/GreaterExplosionPotion.cs b/Scripts/Items/Skill Items/Magical/Potions/Explosion Potions/GreaterExplosionPotion.cs index 974b6f311..78f47bc68 100644 --- a/Scripts/Items/Skill Items/Magical/Potions/Explosion Potions/GreaterExplosionPotion.cs +++ b/Scripts/Items/Skill Items/Magical/Potions/Explosion Potions/GreaterExplosionPotion.cs @@ -5,8 +5,8 @@ namespace Server.Items { public class GreaterExplosionPotion : BaseExplosionPotion { - public override int MinDamage { get { return Core.AOS ? 20 : 15; } } - public override int MaxDamage { get { return Core.AOS ? 40 : 30; } } + public override int MinDamage => Core.AOS ? 20 : 15; + public override int MaxDamage => Core.AOS ? 40 : 30; [Constructible] public GreaterExplosionPotion() : base( PotionEffect.ExplosionGreater ) @@ -31,4 +31,4 @@ namespace Server.Items int version = reader.ReadInt(); } } -} \ No newline at end of file +} diff --git a/Scripts/Items/Skill Items/Magical/Potions/Explosion Potions/LesserExplosionPotion.cs b/Scripts/Items/Skill Items/Magical/Potions/Explosion Potions/LesserExplosionPotion.cs index d005d1a6b..3c9425e24 100644 --- a/Scripts/Items/Skill Items/Magical/Potions/Explosion Potions/LesserExplosionPotion.cs +++ b/Scripts/Items/Skill Items/Magical/Potions/Explosion Potions/LesserExplosionPotion.cs @@ -5,8 +5,8 @@ namespace Server.Items { public class LesserExplosionPotion : BaseExplosionPotion { - public override int MinDamage { get { return 5; } } - public override int MaxDamage { get { return 10; } } + public override int MinDamage => 5; + public override int MaxDamage => 10; [Constructible] public LesserExplosionPotion() : base( PotionEffect.ExplosionLesser ) @@ -31,4 +31,4 @@ namespace Server.Items int version = reader.ReadInt(); } } -} \ No newline at end of file +} diff --git a/Scripts/Items/Skill Items/Magical/Potions/Heal Potions/GreaterHealPotion.cs b/Scripts/Items/Skill Items/Magical/Potions/Heal Potions/GreaterHealPotion.cs index 67439ae5d..1a369a70b 100644 --- a/Scripts/Items/Skill Items/Magical/Potions/Heal Potions/GreaterHealPotion.cs +++ b/Scripts/Items/Skill Items/Magical/Potions/Heal Potions/GreaterHealPotion.cs @@ -5,9 +5,9 @@ namespace Server.Items { public class GreaterHealPotion : BaseHealPotion { - public override int MinHeal { get { return (Core.AOS ? 20 : 9); } } - public override int MaxHeal { get { return (Core.AOS ? 25 : 30); } } - public override double Delay{ get{ return 10.0; } } + public override int MinHeal => (Core.AOS ? 20 : 9); + public override int MaxHeal => (Core.AOS ? 25 : 30); + public override double Delay => 10.0; [Constructible] public GreaterHealPotion() : base( PotionEffect.HealGreater ) @@ -32,4 +32,4 @@ namespace Server.Items int version = reader.ReadInt(); } } -} \ No newline at end of file +} diff --git a/Scripts/Items/Skill Items/Magical/Potions/Heal Potions/HealPotion.cs b/Scripts/Items/Skill Items/Magical/Potions/Heal Potions/HealPotion.cs index a34cf673a..eba1f0f52 100644 --- a/Scripts/Items/Skill Items/Magical/Potions/Heal Potions/HealPotion.cs +++ b/Scripts/Items/Skill Items/Magical/Potions/Heal Potions/HealPotion.cs @@ -5,9 +5,9 @@ namespace Server.Items { public class HealPotion : BaseHealPotion { - public override int MinHeal { get { return (Core.AOS ? 13 : 6); } } - public override int MaxHeal { get { return (Core.AOS ? 16 : 20); } } - public override double Delay{ get{ return (Core.AOS ? 8.0 : 10.0); } } + public override int MinHeal => (Core.AOS ? 13 : 6); + public override int MaxHeal => (Core.AOS ? 16 : 20); + public override double Delay => (Core.AOS ? 8.0 : 10.0); [Constructible] public HealPotion() : base( PotionEffect.Heal ) @@ -32,4 +32,4 @@ namespace Server.Items int version = reader.ReadInt(); } } -} \ No newline at end of file +} diff --git a/Scripts/Items/Skill Items/Magical/Potions/Heal Potions/LesserHealPotion.cs b/Scripts/Items/Skill Items/Magical/Potions/Heal Potions/LesserHealPotion.cs index a3d863812..5f5a016b2 100644 --- a/Scripts/Items/Skill Items/Magical/Potions/Heal Potions/LesserHealPotion.cs +++ b/Scripts/Items/Skill Items/Magical/Potions/Heal Potions/LesserHealPotion.cs @@ -5,9 +5,9 @@ namespace Server.Items { public class LesserHealPotion : BaseHealPotion { - public override int MinHeal { get { return (Core.AOS ? 6 : 3); } } - public override int MaxHeal { get { return (Core.AOS ? 8 : 10); } } - public override double Delay{ get{ return (Core.AOS ? 3.0 : 10.0); } } + public override int MinHeal => (Core.AOS ? 6 : 3); + public override int MaxHeal => (Core.AOS ? 8 : 10); + public override double Delay => (Core.AOS ? 3.0 : 10.0); [Constructible] public LesserHealPotion() : base( PotionEffect.HealLesser ) @@ -32,4 +32,4 @@ namespace Server.Items int version = reader.ReadInt(); } } -} \ No newline at end of file +} diff --git a/Scripts/Items/Skill Items/Magical/Potions/InvisibilityPotion.cs b/Scripts/Items/Skill Items/Magical/Potions/InvisibilityPotion.cs index e9730d408..528b2d33f 100644 --- a/Scripts/Items/Skill Items/Magical/Potions/InvisibilityPotion.cs +++ b/Scripts/Items/Skill Items/Magical/Potions/InvisibilityPotion.cs @@ -5,8 +5,8 @@ using Server; namespace Server.Items { public class InvisibilityPotion : BasePotion - { - public override int LabelNumber{ get{ return 1072941; } } // Potion of Invisibility + { + public override int LabelNumber => 1072941; // Potion of Invisibility [Constructible] public InvisibilityPotion() : base( 0xF0A, PotionEffect.Invisibility ) @@ -17,7 +17,7 @@ namespace Server.Items public InvisibilityPotion( Serial serial ) : base( serial ) { } - + public override void Drink( Mobile from ) { if ( from.Hidden ) @@ -25,51 +25,51 @@ namespace Server.Items from.SendLocalizedMessage( 1073185 ); // You are already unseen. return; } - + if ( HasTimer( from ) ) { from.SendLocalizedMessage( 1073186 ); // An invisibility potion is already taking effect on your person. return; } - + Consume(); - m_Table[ from ] = Timer.DelayCall( TimeSpan.FromSeconds( 2 ), new TimerStateCallback( Hide_Callback ), from ); + m_Table[ from ] = Timer.DelayCall( TimeSpan.FromSeconds( 2 ), new TimerStateCallback( Hide_Callback ), from ); PlayDrinkEffect( from ); } - + private static void Hide_Callback( object obj ) { if ( obj is Mobile ) Hide( (Mobile) obj ); } - + public static void Hide( Mobile m ) { Effects.SendLocationParticles( EffectItem.Create( new Point3D( m.X, m.Y, m.Z + 16 ), m.Map, EffectItem.DefaultDuration ), 0x376A, 10, 15, 5045 ); m.PlaySound( 0x3C4 ); - + m.Hidden = true; - + BuffInfo.RemoveBuff( m, BuffIcon.HidingAndOrStealth ); BuffInfo.AddBuff( m, new BuffInfo( BuffIcon.Invisibility, 1075825 ) ); //Invisibility/Invisible - + RemoveTimer( m ); - + Timer.DelayCall( TimeSpan.FromSeconds( 30 ), new TimerStateCallback( EndHide_Callback ), m ); } - + private static void EndHide_Callback( object obj ) { if ( obj is Mobile ) EndHide( (Mobile) obj ); } - + public static void EndHide( Mobile m ) { m.RevealingAction(); RemoveTimer( m ); } - + private static Hashtable m_Table = new Hashtable(); public static bool HasTimer( Mobile m ) @@ -87,11 +87,11 @@ namespace Server.Items m_Table.Remove( m ); } } - + public static void Iterrupt( Mobile m ) { m.SendLocalizedMessage( 1073187 ); // The invisibility effect is interrupted. - RemoveTimer( m ); + RemoveTimer( m ); } public override void Serialize( GenericWriter writer ) diff --git a/Scripts/Items/Skill Items/Magical/Potions/ParasiticPotion.cs b/Scripts/Items/Skill Items/Magical/Potions/ParasiticPotion.cs index 487233b5e..705ed11c1 100644 --- a/Scripts/Items/Skill Items/Magical/Potions/ParasiticPotion.cs +++ b/Scripts/Items/Skill Items/Magical/Potions/ParasiticPotion.cs @@ -5,12 +5,13 @@ namespace Server.Items { public class ParasiticPotion : BasePoisonPotion { - public override Poison Poison{ get{ return Poison.Greater; } } /* public override Poison Poison{ get{ return Poison.Darkglow; } } MUST be restored when prerequisites are done */ + /* public override Poison Poison => Poison.Darkglow; MUST be restored when prerequisites are done */ + public override Poison Poison => Poison.Greater; - public override double MinPoisoningSkill{ get{ return 95.0; } } - public override double MaxPoisoningSkill{ get{ return 100.0; } } - - public override int LabelNumber{ get{ return 1072848; } } // Parasitic Poison + public override double MinPoisoningSkill => 95.0; + public override double MaxPoisoningSkill => 100.0; + + public override int LabelNumber => 1072848; // Parasitic Poison [Constructible] public ParasiticPotion() : base( PotionEffect.Parasitic ) diff --git a/Scripts/Items/Skill Items/Magical/Potions/Poison Potions/DeadlyPoisonPotion.cs b/Scripts/Items/Skill Items/Magical/Potions/Poison Potions/DeadlyPoisonPotion.cs index 46fce362a..f3a2c8254 100644 --- a/Scripts/Items/Skill Items/Magical/Potions/Poison Potions/DeadlyPoisonPotion.cs +++ b/Scripts/Items/Skill Items/Magical/Potions/Poison Potions/DeadlyPoisonPotion.cs @@ -5,10 +5,10 @@ namespace Server.Items { public class DeadlyPoisonPotion : BasePoisonPotion { - public override Poison Poison{ get{ return Poison.Deadly; } } + public override Poison Poison => Poison.Deadly; - public override double MinPoisoningSkill{ get{ return 95.0; } } - public override double MaxPoisoningSkill{ get{ return 100.0; } } + public override double MinPoisoningSkill => 95.0; + public override double MaxPoisoningSkill => 100.0; [Constructible] public DeadlyPoisonPotion() : base( PotionEffect.PoisonDeadly ) @@ -33,4 +33,4 @@ namespace Server.Items int version = reader.ReadInt(); } } -} \ No newline at end of file +} diff --git a/Scripts/Items/Skill Items/Magical/Potions/Poison Potions/GreaterPoisonPotion.cs b/Scripts/Items/Skill Items/Magical/Potions/Poison Potions/GreaterPoisonPotion.cs index c6b2f36c0..212fd76ad 100644 --- a/Scripts/Items/Skill Items/Magical/Potions/Poison Potions/GreaterPoisonPotion.cs +++ b/Scripts/Items/Skill Items/Magical/Potions/Poison Potions/GreaterPoisonPotion.cs @@ -5,10 +5,10 @@ namespace Server.Items { public class GreaterPoisonPotion : BasePoisonPotion { - public override Poison Poison{ get{ return Poison.Greater; } } + public override Poison Poison => Poison.Greater; - public override double MinPoisoningSkill{ get{ return 60.0; } } - public override double MaxPoisoningSkill{ get{ return 100.0; } } + public override double MinPoisoningSkill => 60.0; + public override double MaxPoisoningSkill => 100.0; [Constructible] public GreaterPoisonPotion() : base( PotionEffect.PoisonGreater ) @@ -33,4 +33,4 @@ namespace Server.Items int version = reader.ReadInt(); } } -} \ No newline at end of file +} diff --git a/Scripts/Items/Skill Items/Magical/Potions/Poison Potions/LesserPoisonPotion.cs b/Scripts/Items/Skill Items/Magical/Potions/Poison Potions/LesserPoisonPotion.cs index ab5f4e4ed..26cc6c612 100644 --- a/Scripts/Items/Skill Items/Magical/Potions/Poison Potions/LesserPoisonPotion.cs +++ b/Scripts/Items/Skill Items/Magical/Potions/Poison Potions/LesserPoisonPotion.cs @@ -5,10 +5,10 @@ namespace Server.Items { public class LesserPoisonPotion : BasePoisonPotion { - public override Poison Poison{ get{ return Poison.Lesser; } } + public override Poison Poison => Poison.Lesser; - public override double MinPoisoningSkill{ get{ return 0.0; } } - public override double MaxPoisoningSkill{ get{ return 60.0; } } + public override double MinPoisoningSkill => 0.0; + public override double MaxPoisoningSkill => 60.0; [Constructible] public LesserPoisonPotion() : base( PotionEffect.PoisonLesser ) @@ -33,4 +33,4 @@ namespace Server.Items int version = reader.ReadInt(); } } -} \ No newline at end of file +} diff --git a/Scripts/Items/Skill Items/Magical/Potions/Poison Potions/PoisonPotion.cs b/Scripts/Items/Skill Items/Magical/Potions/Poison Potions/PoisonPotion.cs index 024bc48b5..eacaa462c 100644 --- a/Scripts/Items/Skill Items/Magical/Potions/Poison Potions/PoisonPotion.cs +++ b/Scripts/Items/Skill Items/Magical/Potions/Poison Potions/PoisonPotion.cs @@ -5,10 +5,10 @@ namespace Server.Items { public class PoisonPotion : BasePoisonPotion { - public override Poison Poison{ get{ return Poison.Regular; } } + public override Poison Poison => Poison.Regular; - public override double MinPoisoningSkill{ get{ return 30.0; } } - public override double MaxPoisoningSkill{ get{ return 70.0; } } + public override double MinPoisoningSkill => 30.0; + public override double MaxPoisoningSkill => 70.0; [Constructible] public PoisonPotion() : base( PotionEffect.Poison ) @@ -33,4 +33,4 @@ namespace Server.Items int version = reader.ReadInt(); } } -} \ No newline at end of file +} diff --git a/Scripts/Items/Skill Items/Magical/Potions/Refresh Potions/RefreshPotion.cs b/Scripts/Items/Skill Items/Magical/Potions/Refresh Potions/RefreshPotion.cs index c1e312d7f..555d6f678 100644 --- a/Scripts/Items/Skill Items/Magical/Potions/Refresh Potions/RefreshPotion.cs +++ b/Scripts/Items/Skill Items/Magical/Potions/Refresh Potions/RefreshPotion.cs @@ -5,7 +5,7 @@ namespace Server.Items { public class RefreshPotion : BaseRefreshPotion { - public override double Refresh{ get{ return 0.25; } } + public override double Refresh => 0.25; [Constructible] public RefreshPotion() : base( PotionEffect.Refresh ) @@ -30,4 +30,4 @@ namespace Server.Items int version = reader.ReadInt(); } } -} \ No newline at end of file +} diff --git a/Scripts/Items/Skill Items/Magical/Potions/Refresh Potions/TotalRefreshPotion.cs b/Scripts/Items/Skill Items/Magical/Potions/Refresh Potions/TotalRefreshPotion.cs index 373c1b4d7..37a439180 100644 --- a/Scripts/Items/Skill Items/Magical/Potions/Refresh Potions/TotalRefreshPotion.cs +++ b/Scripts/Items/Skill Items/Magical/Potions/Refresh Potions/TotalRefreshPotion.cs @@ -5,7 +5,7 @@ namespace Server.Items { public class TotalRefreshPotion : BaseRefreshPotion { - public override double Refresh{ get{ return 1.0; } } + public override double Refresh => 1.0; [Constructible] public TotalRefreshPotion() : base( PotionEffect.RefreshTotal ) @@ -30,4 +30,4 @@ namespace Server.Items int version = reader.ReadInt(); } } -} \ No newline at end of file +} diff --git a/Scripts/Items/Skill Items/Magical/Potions/Strength Potions/GreaterStrengthPotion.cs b/Scripts/Items/Skill Items/Magical/Potions/Strength Potions/GreaterStrengthPotion.cs index bdd3e2596..b498e9f83 100644 --- a/Scripts/Items/Skill Items/Magical/Potions/Strength Potions/GreaterStrengthPotion.cs +++ b/Scripts/Items/Skill Items/Magical/Potions/Strength Potions/GreaterStrengthPotion.cs @@ -5,8 +5,8 @@ namespace Server.Items { public class GreaterStrengthPotion : BaseStrengthPotion { - public override int StrOffset{ get{ return 20; } } - public override TimeSpan Duration{ get{ return TimeSpan.FromMinutes( 2.0 ); } } + public override int StrOffset => 20; + public override TimeSpan Duration => TimeSpan.FromMinutes( 2.0 ); [Constructible] public GreaterStrengthPotion() : base( PotionEffect.StrengthGreater ) @@ -31,4 +31,4 @@ namespace Server.Items int version = reader.ReadInt(); } } -} \ No newline at end of file +} diff --git a/Scripts/Items/Skill Items/Magical/Potions/Strength Potions/StrengthPotion.cs b/Scripts/Items/Skill Items/Magical/Potions/Strength Potions/StrengthPotion.cs index 1f89ab890..c9b2c3143 100644 --- a/Scripts/Items/Skill Items/Magical/Potions/Strength Potions/StrengthPotion.cs +++ b/Scripts/Items/Skill Items/Magical/Potions/Strength Potions/StrengthPotion.cs @@ -5,8 +5,8 @@ namespace Server.Items { public class StrengthPotion : BaseStrengthPotion { - public override int StrOffset{ get{ return 10; } } - public override TimeSpan Duration{ get{ return TimeSpan.FromMinutes( 2.0 ); } } + public override int StrOffset => 10; + public override TimeSpan Duration => TimeSpan.FromMinutes( 2.0 ); [Constructible] public StrengthPotion() : base( PotionEffect.Strength ) @@ -31,4 +31,4 @@ namespace Server.Items int version = reader.ReadInt(); } } -} \ No newline at end of file +} diff --git a/Scripts/Items/Skill Items/Magical/Runebook.cs b/Scripts/Items/Skill Items/Magical/Runebook.cs index 41379e899..a1db5bdd3 100644 --- a/Scripts/Items/Skill Items/Magical/Runebook.cs +++ b/Scripts/Items/Skill Items/Magical/Runebook.cs @@ -108,7 +108,7 @@ namespace Server.Items } } - public override int LabelNumber{ get{ return 1041267; } } // runebook + public override int LabelNumber => 1041267; // runebook [Constructible] public Runebook( int maxCharges ) : base( Core.AOS ? 0x22C5 : 0xEFA ) diff --git a/Scripts/Items/Skill Items/Magical/Spellbook.cs b/Scripts/Items/Skill Items/Magical/Spellbook.cs index e9647e680..69c5ab642 100644 --- a/Scripts/Items/Skill Items/Magical/Spellbook.cs +++ b/Scripts/Items/Skill Items/Magical/Spellbook.cs @@ -221,9 +221,7 @@ namespace Server.Items return null; } - List list = null; - - m_Table.TryGetValue( from, out list ); + m_Table.TryGetValue( from, out List list ); bool searchAgain = false; diff --git a/Scripts/Items/Skill Items/Magical/SpellweavingBook.cs b/Scripts/Items/Skill Items/Magical/SpellweavingBook.cs index 0375d5843..dcdb21e09 100644 --- a/Scripts/Items/Skill Items/Magical/SpellweavingBook.cs +++ b/Scripts/Items/Skill Items/Magical/SpellweavingBook.cs @@ -6,9 +6,9 @@ namespace Server.Items { public class SpellweavingBook : Spellbook { - public override SpellbookType SpellbookType{ get{ return SpellbookType.Arcanist; } } - public override int BookOffset{ get{ return 600; } } - public override int BookCount{ get{ return 16; } } + public override SpellbookType SpellbookType => SpellbookType.Arcanist; + public override int BookOffset => 600; + public override int BookCount => 16; [Constructible] public SpellweavingBook() : this( (ulong)0 ) @@ -41,4 +41,4 @@ namespace Server.Items int version = reader.ReadEncodedInt(); } } -} \ No newline at end of file +} diff --git a/Scripts/Items/Skill Items/Misc/Bandage.cs b/Scripts/Items/Skill Items/Misc/Bandage.cs index f113af2db..63b74fdf1 100644 --- a/Scripts/Items/Skill Items/Misc/Bandage.cs +++ b/Scripts/Items/Skill Items/Misc/Bandage.cs @@ -11,7 +11,7 @@ namespace Server.Items { public class Bandage : Item, IDyable { - public static int Range = ( Core.AOS ? 2 : 1 ); + public static int Range = ( Core.AOS ? 2 : 1 ); public override double DefaultWeight { @@ -204,8 +204,7 @@ namespace Server.Items public static BandageContext GetContext( Mobile healer ) { - BandageContext bc = null; - m_Table.TryGetValue( healer, out bc ); + m_Table.TryGetValue( healer, out BandageContext bc ); return bc; } @@ -514,7 +513,7 @@ namespace Server.Items else if ( Core.AOS ) { if (dex < 204) - { + { seconds = 3.2-(Math.Sin((double)dex/130)*2.5) + resDelay; } else @@ -538,7 +537,7 @@ namespace Server.Items if ( context != null ) context.StopHeal(); seconds *= 1000; - + context = new BandageContext( healer, patient, TimeSpan.FromMilliseconds( seconds ) ); m_Table[healer] = context; @@ -553,4 +552,4 @@ namespace Server.Items return null; } } -} \ No newline at end of file +} diff --git a/Scripts/Items/Skill Items/Misc/FireHorn.cs b/Scripts/Items/Skill Items/Misc/FireHorn.cs index 377dbeb24..d962c27f7 100644 --- a/Scripts/Items/Skill Items/Misc/FireHorn.cs +++ b/Scripts/Items/Skill Items/Misc/FireHorn.cs @@ -9,7 +9,7 @@ namespace Server.Items { public class FireHorn : Item { - public override int LabelNumber{ get{ return 1060456; } } // fire horn + public override int LabelNumber => 1060456; // fire horn [Constructible] public FireHorn() : base( 0xFC7 ) diff --git a/Scripts/Items/Skill Items/Misc/RecipeScroll.cs b/Scripts/Items/Skill Items/Misc/RecipeScroll.cs index 9e7090e79..269ef7ec3 100644 --- a/Scripts/Items/Skill Items/Misc/RecipeScroll.cs +++ b/Scripts/Items/Skill Items/Misc/RecipeScroll.cs @@ -8,7 +8,7 @@ namespace Server.Items { public class RecipeScroll : Item { - public override int LabelNumber { get { return 1074560; } } // recipe scroll + public override int LabelNumber => 1074560; // recipe scroll private int m_RecipeID; @@ -91,7 +91,7 @@ namespace Server.Items { pm.SendLocalizedMessage( 1073427 ); // You already know this recipe. } - + } } diff --git a/Scripts/Items/Skill Items/Misc/RepairDeed.cs b/Scripts/Items/Skill Items/Misc/RepairDeed.cs index 9b321bfa9..1f5176e90 100644 --- a/Scripts/Items/Skill Items/Misc/RepairDeed.cs +++ b/Scripts/Items/Skill Items/Misc/RepairDeed.cs @@ -16,11 +16,11 @@ namespace Server.Items private TextDefinition m_NotNearbyMessage, m_Name; public TextDefinition NotNearbyMessage{ get { return m_NotNearbyMessage; } } - public TextDefinition Name { get { return m_Name; } } + public TextDefinition Name => m_Name; - public CraftSystem System { get { return m_System; } } - public Type[] NearbyTypes { get { return m_NearbyTypes; } } + public CraftSystem System => m_System; + public Type[] NearbyTypes => m_NearbyTypes; public RepairSkillInfo( CraftSystem system, Type[] nearbyTypes, TextDefinition notNearbyMessage, TextDefinition name ) { @@ -35,7 +35,7 @@ namespace Server.Items { } - public static RepairSkillInfo[] Table { get { return m_Table; } } + public static RepairSkillInfo[] Table => m_Table; private static RepairSkillInfo[] m_Table = new RepairSkillInfo[] { new RepairSkillInfo( DefBlacksmithy.CraftSystem, typeof( Blacksmith ), 1047013, 1023015 ), diff --git a/Scripts/Items/Skill Items/Ninjitsu/Fukiya.cs b/Scripts/Items/Skill Items/Ninjitsu/Fukiya.cs index 235e2632c..df958a9bc 100644 --- a/Scripts/Items/Skill Items/Ninjitsu/Fukiya.cs +++ b/Scripts/Items/Skill Items/Ninjitsu/Fukiya.cs @@ -11,18 +11,18 @@ namespace Server.Items [FlippableAttribute( 0x27AA, 0x27F5 )] public class Fukiya : Item, INinjaWeapon { - public virtual int WrongAmmoMessage { get { return 1063329; } } //You can only load fukiya darts - public virtual int NoFreeHandMessage { get { return 1063327; } } //You must have a free hand to use a fukiya. - public virtual int EmptyWeaponMessage { get { return 1063325; } } //You have no fukiya darts! - public virtual int RecentlyUsedMessage { get { return 1063326; } } //You are already using that fukiya. - public virtual int FullWeaponMessage { get { return 1063330; } } //You can only load fukiya darts + public virtual int WrongAmmoMessage => 1063329; //You can only load fukiya darts + public virtual int NoFreeHandMessage => 1063327; //You must have a free hand to use a fukiya. + public virtual int EmptyWeaponMessage => 1063325; //You have no fukiya darts! + public virtual int RecentlyUsedMessage => 1063326; //You are already using that fukiya. + public virtual int FullWeaponMessage => 1063330; //You can only load fukiya darts - public virtual int WeaponMinRange { get { return 0; } } - public virtual int WeaponMaxRange { get { return 6; } } + public virtual int WeaponMinRange => 0; + public virtual int WeaponMaxRange => 6; public virtual int WeaponDamage { get { return Utility.RandomMinMax(4, 6); } } - public Type AmmoType{ get { return typeof(FukiyaDarts); } } + public Type AmmoType => typeof(FukiyaDarts); private int m_UsesRemaining; private Poison m_Poison; @@ -131,4 +131,4 @@ namespace Server.Items } } } -} \ No newline at end of file +} diff --git a/Scripts/Items/Skill Items/Ninjitsu/LeatherNinjaBelt.cs b/Scripts/Items/Skill Items/Ninjitsu/LeatherNinjaBelt.cs index 67956f8e4..e164a863f 100644 --- a/Scripts/Items/Skill Items/Ninjitsu/LeatherNinjaBelt.cs +++ b/Scripts/Items/Skill Items/Ninjitsu/LeatherNinjaBelt.cs @@ -11,20 +11,20 @@ namespace Server.Items [FlippableAttribute( 0x2790, 0x27DB )] public class LeatherNinjaBelt : BaseWaist, IDyable, INinjaWeapon { - public override CraftResource DefaultResource{ get{ return CraftResource.RegularLeather; } } + public override CraftResource DefaultResource => CraftResource.RegularLeather; - public virtual int WrongAmmoMessage { get { return 1063301; } } //You can only place shuriken in a ninja belt. - public virtual int NoFreeHandMessage { get { return 1063299; } } //You must have a free hand to throw shuriken. - public virtual int EmptyWeaponMessage { get { return 1063297; } } //You have no shuriken in your ninja belt! - public virtual int RecentlyUsedMessage { get { return 1063298; } } //You cannot throw another shuriken yet. - public virtual int FullWeaponMessage { get { return 1063302; } } //You cannot add any more shuriken. + public virtual int WrongAmmoMessage => 1063301; //You can only place shuriken in a ninja belt. + public virtual int NoFreeHandMessage => 1063299; //You must have a free hand to throw shuriken. + public virtual int EmptyWeaponMessage => 1063297; //You have no shuriken in your ninja belt! + public virtual int RecentlyUsedMessage => 1063298; //You cannot throw another shuriken yet. + public virtual int FullWeaponMessage => 1063302; //You cannot add any more shuriken. - public virtual int WeaponMinRange { get { return 2; } } - public virtual int WeaponMaxRange { get { return 10; } } + public virtual int WeaponMinRange => 2; + public virtual int WeaponMaxRange => 10; public virtual int WeaponDamage { get { return Utility.RandomMinMax(3, 5); } } - public virtual Type AmmoType { get { return typeof(Shuriken); } } + public virtual Type AmmoType => typeof(Shuriken); private int m_UsesRemaining; private Poison m_Poison; @@ -144,4 +144,4 @@ namespace Server.Items } } } -} \ No newline at end of file +} diff --git a/Scripts/Items/Skill Items/Specialized/Sand.cs b/Scripts/Items/Skill Items/Specialized/Sand.cs index 52a346480..db4763abc 100644 --- a/Scripts/Items/Skill Items/Specialized/Sand.cs +++ b/Scripts/Items/Skill Items/Specialized/Sand.cs @@ -9,7 +9,7 @@ namespace Server.Items int ICommodity.DescriptionNumber { get { return LabelNumber; } } bool ICommodity.IsDeedable { get { return true; } } - public override int LabelNumber{ get{ return 1044626; } } // sand + public override int LabelNumber => 1044626; // sand [Constructible] public Sand() : this( 1 ) @@ -44,4 +44,4 @@ namespace Server.Items this.Name = null; } } -} \ No newline at end of file +} diff --git a/Scripts/Items/Skill Items/Tailor Items/Dyetubs/DyeTub.cs b/Scripts/Items/Skill Items/Tailor Items/Dyetubs/DyeTub.cs index 3a66d7759..26d6ab654 100644 --- a/Scripts/Items/Skill Items/Tailor Items/Dyetubs/DyeTub.cs +++ b/Scripts/Items/Skill Items/Tailor Items/Dyetubs/DyeTub.cs @@ -51,7 +51,7 @@ namespace Server.Items base.Serialize( writer ); writer.Write( (int) 1 ); // version - + writer.Write( (int)m_SecureLevel ); writer.Write( (bool) m_Redyable ); writer.Write( (int) m_DyedHue ); @@ -109,7 +109,7 @@ namespace Server.Items } } } - + [CommandProperty( AccessLevel.GameMaster )] public SecureLevel Level { @@ -123,13 +123,13 @@ namespace Server.Items } } - [Constructible] + [Constructible] public DyeTub() : base( 0xFAB ) { Weight = 10.0; m_Redyable = true; } - + public override void GetContextMenuEntries( Mobile from, List list ) { base.GetContextMenuEntries( from, list ); @@ -141,7 +141,7 @@ namespace Server.Items } // Three metallic tubs now. - public virtual bool MetallicHues{ get { return false; } } + public virtual bool MetallicHues => false; // Select the clothing to dye. public virtual int TargetMessage{ get{ return 500859; } } @@ -290,4 +290,4 @@ namespace Server.Items } } } -} \ No newline at end of file +} diff --git a/Scripts/Items/Skill Items/Tailor Items/Dyetubs/FurnitureDyeTub.cs b/Scripts/Items/Skill Items/Tailor Items/Dyetubs/FurnitureDyeTub.cs index d32518b32..6830fc864 100644 --- a/Scripts/Items/Skill Items/Tailor Items/Dyetubs/FurnitureDyeTub.cs +++ b/Scripts/Items/Skill Items/Tailor Items/Dyetubs/FurnitureDyeTub.cs @@ -6,9 +6,9 @@ namespace Server.Items { public override bool AllowDyables => false; public override bool AllowFurniture => true; - public override int TargetMessage{ get{ return 501019; } } // Select the furniture to dye. - public override int FailMessage{ get{ return 501021; } } // That is not a piece of furniture. - public override int LabelNumber{ get{ return 1041246; } } // Furniture Dye Tub + public override int TargetMessage => 501019; // Select the furniture to dye. + public override int FailMessage => 501021; // That is not a piece of furniture. + public override int LabelNumber => 1041246; // Furniture Dye Tub private bool m_IsRewardItem; diff --git a/Scripts/Items/Skill Items/Tailor Items/Dyetubs/LeatherDyeTub.cs b/Scripts/Items/Skill Items/Tailor Items/Dyetubs/LeatherDyeTub.cs index ebac46890..3de4f6774 100644 --- a/Scripts/Items/Skill Items/Tailor Items/Dyetubs/LeatherDyeTub.cs +++ b/Scripts/Items/Skill Items/Tailor Items/Dyetubs/LeatherDyeTub.cs @@ -6,10 +6,10 @@ namespace Server.Items { public override bool AllowDyables => false; public override bool AllowLeather => true; - public override int TargetMessage{ get{ return 1042416; } } // Select the leather item to dye. - public override int FailMessage{ get{ return 1042418; } } // You can only dye leather with this tub. - public override int LabelNumber{ get{ return 1041284; } } // Leather Dye Tub - public override CustomHuePicker CustomHuePicker { get { return CustomHuePicker.LeatherDyeTub; } } + public override int TargetMessage => 1042416; // Select the leather item to dye. + public override int FailMessage => 1042418; // You can only dye leather with this tub. + public override int LabelNumber => 1041284; // Leather Dye Tub + public override CustomHuePicker CustomHuePicker => CustomHuePicker.LeatherDyeTub; private bool m_IsRewardItem; diff --git a/Scripts/Items/Skill Items/Tailor Items/Dyetubs/MetallicClothDyetub.cs b/Scripts/Items/Skill Items/Tailor Items/Dyetubs/MetallicClothDyetub.cs index 0b267b1b4..ed34305c1 100644 --- a/Scripts/Items/Skill Items/Tailor Items/Dyetubs/MetallicClothDyetub.cs +++ b/Scripts/Items/Skill Items/Tailor Items/Dyetubs/MetallicClothDyetub.cs @@ -4,7 +4,7 @@ namespace Server.Items { public class MetallicClothDyetub : DyeTub { - public override int LabelNumber { get { return 1152920; } } // Metallic Cloth ... + public override int LabelNumber => 1152920; // Metallic Cloth ... public override bool MetallicHues => true; diff --git a/Scripts/Items/Skill Items/Tailor Items/Dyetubs/MetallicLeatherDyeTub.cs b/Scripts/Items/Skill Items/Tailor Items/Dyetubs/MetallicLeatherDyeTub.cs index e3d4f7bd3..01be53f74 100644 --- a/Scripts/Items/Skill Items/Tailor Items/Dyetubs/MetallicLeatherDyeTub.cs +++ b/Scripts/Items/Skill Items/Tailor Items/Dyetubs/MetallicLeatherDyeTub.cs @@ -4,9 +4,9 @@ namespace Server.Items { public class MetallicLeatherDyeTub : LeatherDyeTub { - public override CustomHuePicker CustomHuePicker{ get{ return null; } } + public override CustomHuePicker CustomHuePicker => null; - public override int LabelNumber { get { return 1153495; } } // Metallic Leather ... + public override int LabelNumber => 1153495; // Metallic Leather ... public override bool MetallicHues => true; diff --git a/Scripts/Items/Skill Items/Tailor Items/Dyetubs/RewardBlackDyeTub.cs b/Scripts/Items/Skill Items/Tailor Items/Dyetubs/RewardBlackDyeTub.cs index 93ea8f636..d8b60cf02 100644 --- a/Scripts/Items/Skill Items/Tailor Items/Dyetubs/RewardBlackDyeTub.cs +++ b/Scripts/Items/Skill Items/Tailor Items/Dyetubs/RewardBlackDyeTub.cs @@ -4,7 +4,7 @@ namespace Server.Items { public class RewardBlackDyeTub : DyeTub, Engines.VeteranRewards.IRewardItem { - public override int LabelNumber{ get{ return 1006008; } } // Black Dye Tub + public override int LabelNumber => 1006008; // Black Dye Tub private bool m_IsRewardItem; @@ -68,4 +68,4 @@ namespace Server.Items } } } -} \ No newline at end of file +} diff --git a/Scripts/Items/Skill Items/Tailor Items/Dyetubs/RunebookDyeTub.cs b/Scripts/Items/Skill Items/Tailor Items/Dyetubs/RunebookDyeTub.cs index 639d70135..77c58cb92 100644 --- a/Scripts/Items/Skill Items/Tailor Items/Dyetubs/RunebookDyeTub.cs +++ b/Scripts/Items/Skill Items/Tailor Items/Dyetubs/RunebookDyeTub.cs @@ -6,10 +6,10 @@ namespace Server.Items { public override bool AllowDyables => false; public override bool AllowRunebooks => true; - public override int TargetMessage{ get{ return 1049774; } } // Target the runebook or runestone to dye - public override int FailMessage{ get{ return 1049775; } } // You can only dye runestones or runebooks with this tub. - public override int LabelNumber{ get{ return 1049740; } } // Runebook Dye Tub - public override CustomHuePicker CustomHuePicker{ get{ return CustomHuePicker.LeatherDyeTub; } } + public override int TargetMessage => 1049774; // Target the runebook or runestone to dye + public override int FailMessage => 1049775; // You can only dye runestones or runebooks with this tub. + public override int LabelNumber => 1049740; // Runebook Dye Tub + public override CustomHuePicker CustomHuePicker => CustomHuePicker.LeatherDyeTub; private bool m_IsRewardItem; diff --git a/Scripts/Items/Skill Items/Tailor Items/Dyetubs/SpecialDyeTub.cs b/Scripts/Items/Skill Items/Tailor Items/Dyetubs/SpecialDyeTub.cs index 169bf8b90..460dfa3b3 100644 --- a/Scripts/Items/Skill Items/Tailor Items/Dyetubs/SpecialDyeTub.cs +++ b/Scripts/Items/Skill Items/Tailor Items/Dyetubs/SpecialDyeTub.cs @@ -5,8 +5,8 @@ namespace Server.Items { public class SpecialDyeTub : DyeTub, IRewardItem { - public override CustomHuePicker CustomHuePicker{ get{ return CustomHuePicker.SpecialDyeTub; } } - public override int LabelNumber{ get{ return 1041285; } } // Special Dye Tub + public override CustomHuePicker CustomHuePicker => CustomHuePicker.SpecialDyeTub; + public override int LabelNumber => 1041285; // Special Dye Tub private bool m_IsRewardItem; @@ -68,4 +68,4 @@ namespace Server.Items } } } -} \ No newline at end of file +} diff --git a/Scripts/Items/Skill Items/Tailor Items/Dyetubs/StatuetteDyeTub.cs b/Scripts/Items/Skill Items/Tailor Items/Dyetubs/StatuetteDyeTub.cs index c2762dd29..2278202d8 100644 --- a/Scripts/Items/Skill Items/Tailor Items/Dyetubs/StatuetteDyeTub.cs +++ b/Scripts/Items/Skill Items/Tailor Items/Dyetubs/StatuetteDyeTub.cs @@ -6,10 +6,10 @@ namespace Server.Items { public override bool AllowDyables => false; public override bool AllowStatuettes => true; - public override int TargetMessage{ get{ return 1049777; } } // Target the statuette to dye - public override int FailMessage{ get{ return 1049778; } } // You can only dye veteran reward statuettes with this tub. - public override int LabelNumber{ get{ return 1049741; } } // Reward Statuette Dye Tub - public override CustomHuePicker CustomHuePicker{ get{ return CustomHuePicker.LeatherDyeTub; } } + public override int TargetMessage => 1049777; // Target the statuette to dye + public override int FailMessage => 1049778; // You can only dye veteran reward statuettes with this tub. + public override int LabelNumber => 1049741; // Reward Statuette Dye Tub + public override CustomHuePicker CustomHuePicker => CustomHuePicker.LeatherDyeTub; private bool m_IsRewardItem; diff --git a/Scripts/Items/Skill Items/Tailor Items/Dyetubs/WhiteClothDyeTub.cs b/Scripts/Items/Skill Items/Tailor Items/Dyetubs/WhiteClothDyeTub.cs index 7fb5d1976..3ab211453 100644 --- a/Scripts/Items/Skill Items/Tailor Items/Dyetubs/WhiteClothDyeTub.cs +++ b/Scripts/Items/Skill Items/Tailor Items/Dyetubs/WhiteClothDyeTub.cs @@ -5,7 +5,7 @@ namespace Server.Items /* High seas, loot from merchant ship's hold, also a "unc { public class WhiteClothDyeTub : DyeTub { - public override int LabelNumber { get { return 1149984; } } // White Cloth Dye Tub + public override int LabelNumber => 1149984; // White Cloth Dye Tub public override bool Redyable => false; diff --git a/Scripts/Items/Skill Items/Tailor Items/Dyetubs/WhiteLeatherDyeTub.cs b/Scripts/Items/Skill Items/Tailor Items/Dyetubs/WhiteLeatherDyeTub.cs index 35fb302ad..a7470fbdb 100644 --- a/Scripts/Items/Skill Items/Tailor Items/Dyetubs/WhiteLeatherDyeTub.cs +++ b/Scripts/Items/Skill Items/Tailor Items/Dyetubs/WhiteLeatherDyeTub.cs @@ -5,7 +5,7 @@ namespace Server.Items { public class WhiteLeatherDyeTub : LeatherDyeTub /* OSI UO 13th anniv gift, from redeemable gift tickets */ { - public override int LabelNumber { get { return 1149900; } } // White Leather Dye Tub + public override int LabelNumber => 1149900; // White Leather Dye Tub public override bool Redyable => false; diff --git a/Scripts/Items/Skill Items/Thief/DisguiseKit.cs b/Scripts/Items/Skill Items/Thief/DisguiseKit.cs index b5842541a..a9cd849a8 100644 --- a/Scripts/Items/Skill Items/Thief/DisguiseKit.cs +++ b/Scripts/Items/Skill Items/Thief/DisguiseKit.cs @@ -14,7 +14,7 @@ namespace Server.Items { public class DisguiseKit : Item { - public override int LabelNumber{ get{ return 1041078; } } // a disguise kit + public override int LabelNumber => 1041078; // a disguise kit [Constructible] public DisguiseKit() : base( 0xE05 ) @@ -225,7 +225,7 @@ namespace Server.Items m_From.SendGump( new DisguiseGump( m_From, m_Kit, hair, true ) ); DisguiseTimers.RemoveTimer( m_From ); - + DisguiseTimers.CreateTimer( m_From, TimeSpan.FromHours( 2.0 ) ); DisguiseTimers.StartTimer( m_From ); } @@ -275,18 +275,18 @@ namespace Server.Items } } } - + public class DisguiseTimers { public static void Initialize() { new DisguisePersistance(); } - + private class InternalTimer : Timer { private Mobile m_Player; - + public InternalTimer( Mobile m, TimeSpan delay ) : base( delay ) { m_Player = m; @@ -299,23 +299,22 @@ namespace Server.Items if ( m_Player is PlayerMobile ) ((PlayerMobile)m_Player).SetHairMods( -1, -1 ); - + DisguiseTimers.RemoveTimer( m_Player ); } } - + public static void CreateTimer( Mobile m, TimeSpan delay ) { if ( m != null ) if ( !m_Timers.ContainsKey( m ) ) m_Timers[m] = new InternalTimer( m, delay ); } - + public static void StartTimer( Mobile m ) { - Timer t = null; - m_Timers.TryGetValue(m, out t); - + m_Timers.TryGetValue( m, out Timer t ); + if ( t != null ) t.Start(); } @@ -327,8 +326,7 @@ namespace Server.Items public static bool StopTimer( Mobile m ) { - Timer t = null; - m_Timers.TryGetValue(m, out t); + m_Timers.TryGetValue( m, out Timer t ); if ( t != null ) { @@ -342,34 +340,32 @@ namespace Server.Items return ( t != null ); } - + public static bool RemoveTimer( Mobile m ) { - Timer t = null; - m_Timers.TryGetValue(m, out t); + m_Timers.TryGetValue( m, out Timer t ); if ( t != null ) { t.Stop(); m_Timers.Remove( m ); } - + return ( t != null ); } - + public static TimeSpan TimeRemaining( Mobile m ) { - Timer t = null; - m_Timers.TryGetValue(m, out t); + m_Timers.TryGetValue( m, out Timer t ); if ( t != null ) { return t.Next - DateTime.UtcNow; } - + return TimeSpan.Zero; } - + private static Dictionary m_Timers = new Dictionary(); public static Dictionary Timers @@ -377,4 +373,4 @@ namespace Server.Items get { return m_Timers; } } } -} \ No newline at end of file +} diff --git a/Scripts/Items/Skill Items/Tools/BaseTool.cs b/Scripts/Items/Skill Items/Tools/BaseTool.cs index bfe1ce1b4..0eaa16fd1 100644 --- a/Scripts/Items/Skill Items/Tools/BaseTool.cs +++ b/Scripts/Items/Skill Items/Tools/BaseTool.cs @@ -39,7 +39,7 @@ namespace Server.Items set { m_UsesRemaining = value; InvalidateProperties(); } } - public virtual bool BreakOnDepletion { get { return true; } } + public virtual bool BreakOnDepletion => true; public void ScaleUses() { @@ -196,4 +196,4 @@ namespace Server.Items #endregion } -} \ No newline at end of file +} diff --git a/Scripts/Items/Skill Items/Tools/Blowpipe.cs b/Scripts/Items/Skill Items/Tools/Blowpipe.cs index 379a60538..087f3d71d 100644 --- a/Scripts/Items/Skill Items/Tools/Blowpipe.cs +++ b/Scripts/Items/Skill Items/Tools/Blowpipe.cs @@ -7,9 +7,9 @@ namespace Server.Items [FlippableAttribute( 0xE8A, 0xE89 )] public class Blowpipe : BaseTool { - public override CraftSystem CraftSystem { get { return DefGlassblowing.CraftSystem; } } + public override CraftSystem CraftSystem => DefGlassblowing.CraftSystem; - public override int LabelNumber{ get{ return 1044608; } } // blow pipe + public override int LabelNumber => 1044608; // blow pipe [Constructible] public Blowpipe() : base( 0xE8A ) @@ -46,4 +46,4 @@ namespace Server.Items Weight = 4.0; } } -} \ No newline at end of file +} diff --git a/Scripts/Items/Skill Items/Tools/DovetailSaw.cs b/Scripts/Items/Skill Items/Tools/DovetailSaw.cs index d4ba4e6ad..bbaf201af 100644 --- a/Scripts/Items/Skill Items/Tools/DovetailSaw.cs +++ b/Scripts/Items/Skill Items/Tools/DovetailSaw.cs @@ -7,7 +7,7 @@ namespace Server.Items [Flippable( 0x1028, 0x1029 )] public class DovetailSaw : BaseTool { - public override CraftSystem CraftSystem{ get{ return DefCarpentry.CraftSystem; } } + public override CraftSystem CraftSystem => DefCarpentry.CraftSystem; [Constructible] public DovetailSaw() : base( 0x1028 ) @@ -42,4 +42,4 @@ namespace Server.Items Weight = 2.0; } } -} \ No newline at end of file +} diff --git a/Scripts/Items/Skill Items/Tools/DrawKnife.cs b/Scripts/Items/Skill Items/Tools/DrawKnife.cs index 423572a50..7fc22db08 100644 --- a/Scripts/Items/Skill Items/Tools/DrawKnife.cs +++ b/Scripts/Items/Skill Items/Tools/DrawKnife.cs @@ -6,7 +6,7 @@ namespace Server.Items { public class DrawKnife : BaseTool { - public override CraftSystem CraftSystem{ get{ return DefCarpentry.CraftSystem; } } + public override CraftSystem CraftSystem => DefCarpentry.CraftSystem; [Constructible] public DrawKnife() : base( 0x10E4 ) @@ -38,4 +38,4 @@ namespace Server.Items int version = reader.ReadInt(); } } -} \ No newline at end of file +} diff --git a/Scripts/Items/Skill Items/Tools/FletcherTools.cs b/Scripts/Items/Skill Items/Tools/FletcherTools.cs index 0b94807d8..2b0772760 100644 --- a/Scripts/Items/Skill Items/Tools/FletcherTools.cs +++ b/Scripts/Items/Skill Items/Tools/FletcherTools.cs @@ -7,7 +7,7 @@ namespace Server.Items [FlippableAttribute( 0x1022, 0x1023 )] public class FletcherTools : BaseTool { - public override CraftSystem CraftSystem{ get{ return DefBowFletching.CraftSystem; } } + public override CraftSystem CraftSystem => DefBowFletching.CraftSystem; [Constructible] public FletcherTools() : base( 0x1022 ) @@ -42,4 +42,4 @@ namespace Server.Items Weight = 2.0; } } -} \ No newline at end of file +} diff --git a/Scripts/Items/Skill Items/Tools/FlourSifter.cs b/Scripts/Items/Skill Items/Tools/FlourSifter.cs index b1e747c8e..120da6eeb 100644 --- a/Scripts/Items/Skill Items/Tools/FlourSifter.cs +++ b/Scripts/Items/Skill Items/Tools/FlourSifter.cs @@ -6,7 +6,7 @@ namespace Server.Items { public class FlourSifter : BaseTool { - public override CraftSystem CraftSystem{ get{ return DefCooking.CraftSystem; } } + public override CraftSystem CraftSystem => DefCooking.CraftSystem; [Constructible] public FlourSifter() : base( 0x103E ) @@ -38,4 +38,4 @@ namespace Server.Items int version = reader.ReadInt(); } } -} \ No newline at end of file +} diff --git a/Scripts/Items/Skill Items/Tools/Froe.cs b/Scripts/Items/Skill Items/Tools/Froe.cs index 3e5928246..3b572d8c3 100644 --- a/Scripts/Items/Skill Items/Tools/Froe.cs +++ b/Scripts/Items/Skill Items/Tools/Froe.cs @@ -6,7 +6,7 @@ namespace Server.Items { public class Froe : BaseTool { - public override CraftSystem CraftSystem{ get{ return DefCarpentry.CraftSystem; } } + public override CraftSystem CraftSystem => DefCarpentry.CraftSystem; [Constructible] public Froe() : base( 0x10E5 ) @@ -38,4 +38,4 @@ namespace Server.Items int version = reader.ReadInt(); } } -} \ No newline at end of file +} diff --git a/Scripts/Items/Skill Items/Tools/Hammer.cs b/Scripts/Items/Skill Items/Tools/Hammer.cs index 86db4db4f..2e93112df 100644 --- a/Scripts/Items/Skill Items/Tools/Hammer.cs +++ b/Scripts/Items/Skill Items/Tools/Hammer.cs @@ -6,7 +6,7 @@ namespace Server.Items { public class Hammer : BaseTool { - public override CraftSystem CraftSystem{ get{ return DefCarpentry.CraftSystem; } } + public override CraftSystem CraftSystem => DefCarpentry.CraftSystem; [Constructible] public Hammer() : base( 0x102A ) @@ -38,4 +38,4 @@ namespace Server.Items int version = reader.ReadInt(); } } -} \ No newline at end of file +} diff --git a/Scripts/Items/Skill Items/Tools/Inshave.cs b/Scripts/Items/Skill Items/Tools/Inshave.cs index f50bfb736..150d92c52 100644 --- a/Scripts/Items/Skill Items/Tools/Inshave.cs +++ b/Scripts/Items/Skill Items/Tools/Inshave.cs @@ -6,7 +6,7 @@ namespace Server.Items { public class Inshave : BaseTool { - public override CraftSystem CraftSystem{ get{ return DefCarpentry.CraftSystem; } } + public override CraftSystem CraftSystem => DefCarpentry.CraftSystem; [Constructible] public Inshave() : base( 0x10E6 ) @@ -38,4 +38,4 @@ namespace Server.Items int version = reader.ReadInt(); } } -} \ No newline at end of file +} diff --git a/Scripts/Items/Skill Items/Tools/JointingPlane.cs b/Scripts/Items/Skill Items/Tools/JointingPlane.cs index cff032c87..7cc63c95c 100644 --- a/Scripts/Items/Skill Items/Tools/JointingPlane.cs +++ b/Scripts/Items/Skill Items/Tools/JointingPlane.cs @@ -7,7 +7,7 @@ namespace Server.Items [Flippable( 0x1030, 0x1031 )] public class JointingPlane : BaseTool { - public override CraftSystem CraftSystem{ get{ return DefCarpentry.CraftSystem; } } + public override CraftSystem CraftSystem => DefCarpentry.CraftSystem; [Constructible] public JointingPlane() : base( 0x1030 ) @@ -42,4 +42,4 @@ namespace Server.Items Weight = 2.0; } } -} \ No newline at end of file +} diff --git a/Scripts/Items/Skill Items/Tools/MalletAndChisel.cs b/Scripts/Items/Skill Items/Tools/MalletAndChisel.cs index 28a7236dd..444657b1d 100644 --- a/Scripts/Items/Skill Items/Tools/MalletAndChisel.cs +++ b/Scripts/Items/Skill Items/Tools/MalletAndChisel.cs @@ -6,7 +6,7 @@ namespace Server.Items { public class MalletAndChisel : BaseTool { - public override CraftSystem CraftSystem { get { return DefMasonry.CraftSystem; } } + public override CraftSystem CraftSystem => DefMasonry.CraftSystem; [Constructible] public MalletAndChisel() : base( 0x12B3 ) @@ -38,4 +38,4 @@ namespace Server.Items int version = reader.ReadInt(); } } -} \ No newline at end of file +} diff --git a/Scripts/Items/Skill Items/Tools/MapmakersPen.cs b/Scripts/Items/Skill Items/Tools/MapmakersPen.cs index 34e2c6235..6b864c28a 100644 --- a/Scripts/Items/Skill Items/Tools/MapmakersPen.cs +++ b/Scripts/Items/Skill Items/Tools/MapmakersPen.cs @@ -7,9 +7,9 @@ namespace Server.Items [FlippableAttribute( 0x0FBF, 0x0FC0 )] public class MapmakersPen : BaseTool { - public override CraftSystem CraftSystem{ get{ return DefCartography.CraftSystem; } } + public override CraftSystem CraftSystem => DefCartography.CraftSystem; - public override int LabelNumber{ get{ return 1044167; } } // mapmaker's pen + public override int LabelNumber => 1044167; // mapmaker's pen [Constructible] public MapmakersPen() : base( 0x0FBF ) @@ -44,4 +44,4 @@ namespace Server.Items Weight = 1.0; } } -} \ No newline at end of file +} diff --git a/Scripts/Items/Skill Items/Tools/MortarPestle.cs b/Scripts/Items/Skill Items/Tools/MortarPestle.cs index 45bf3552d..c6efd50ab 100644 --- a/Scripts/Items/Skill Items/Tools/MortarPestle.cs +++ b/Scripts/Items/Skill Items/Tools/MortarPestle.cs @@ -6,7 +6,7 @@ namespace Server.Items { public class MortarPestle : BaseTool { - public override CraftSystem CraftSystem{ get{ return DefAlchemy.CraftSystem; } } + public override CraftSystem CraftSystem => DefAlchemy.CraftSystem; [Constructible] public MortarPestle() : base( 0xE9B ) @@ -38,4 +38,4 @@ namespace Server.Items int version = reader.ReadInt(); } } -} \ No newline at end of file +} diff --git a/Scripts/Items/Skill Items/Tools/MouldingPlane.cs b/Scripts/Items/Skill Items/Tools/MouldingPlane.cs index 36c1a110d..77bc09938 100644 --- a/Scripts/Items/Skill Items/Tools/MouldingPlane.cs +++ b/Scripts/Items/Skill Items/Tools/MouldingPlane.cs @@ -7,7 +7,7 @@ namespace Server.Items [Flippable( 0x102C, 0x102D )] public class MouldingPlane : BaseTool { - public override CraftSystem CraftSystem{ get{ return DefCarpentry.CraftSystem; } } + public override CraftSystem CraftSystem => DefCarpentry.CraftSystem; [Constructible] public MouldingPlane() : base( 0x102C ) @@ -39,4 +39,4 @@ namespace Server.Items int version = reader.ReadInt(); } } -} \ No newline at end of file +} diff --git a/Scripts/Items/Skill Items/Tools/Nails.cs b/Scripts/Items/Skill Items/Tools/Nails.cs index f76526122..c249ae69f 100644 --- a/Scripts/Items/Skill Items/Tools/Nails.cs +++ b/Scripts/Items/Skill Items/Tools/Nails.cs @@ -7,7 +7,7 @@ namespace Server.Items [Flippable( 0x102E, 0x102F )] public class Nails : BaseTool { - public override CraftSystem CraftSystem{ get{ return DefCarpentry.CraftSystem; } } + public override CraftSystem CraftSystem => DefCarpentry.CraftSystem; [Constructible] public Nails() : base( 0x102E ) @@ -39,4 +39,4 @@ namespace Server.Items int version = reader.ReadInt(); } } -} \ No newline at end of file +} diff --git a/Scripts/Items/Skill Items/Tools/RollingPin.cs b/Scripts/Items/Skill Items/Tools/RollingPin.cs index 25c53816f..7a59df1b8 100644 --- a/Scripts/Items/Skill Items/Tools/RollingPin.cs +++ b/Scripts/Items/Skill Items/Tools/RollingPin.cs @@ -6,7 +6,7 @@ namespace Server.Items { public class RollingPin : BaseTool { - public override CraftSystem CraftSystem{ get{ return DefCooking.CraftSystem; } } + public override CraftSystem CraftSystem => DefCooking.CraftSystem; [Constructible] public RollingPin() : base( 0x1043 ) @@ -38,4 +38,4 @@ namespace Server.Items int version = reader.ReadInt(); } } -} \ No newline at end of file +} diff --git a/Scripts/Items/Skill Items/Tools/RunicDovetailSaw.cs b/Scripts/Items/Skill Items/Tools/RunicDovetailSaw.cs index a555f1fd5..0cb012d66 100644 --- a/Scripts/Items/Skill Items/Tools/RunicDovetailSaw.cs +++ b/Scripts/Items/Skill Items/Tools/RunicDovetailSaw.cs @@ -6,7 +6,7 @@ namespace Server.Items { public class RunicDovetailSaw : BaseRunicTool { - public override CraftSystem CraftSystem{ get{ return DefCarpentry.CraftSystem; } } + public override CraftSystem CraftSystem => DefCarpentry.CraftSystem; public override int LabelNumber { @@ -16,11 +16,11 @@ namespace Server.Items if ( index >= 1 && index <= 6 ) return 1072633 + index; - + return 1024137; // dovetail saw } } - + [Constructible] public RunicDovetailSaw( CraftResource resource ) : base( resource, 0x1028 ) { @@ -53,4 +53,4 @@ namespace Server.Items int version = reader.ReadInt(); } } -} \ No newline at end of file +} diff --git a/Scripts/Items/Skill Items/Tools/RunicFletcherTool.cs b/Scripts/Items/Skill Items/Tools/RunicFletcherTool.cs index 88a5e9c3e..d70c3e5c0 100644 --- a/Scripts/Items/Skill Items/Tools/RunicFletcherTool.cs +++ b/Scripts/Items/Skill Items/Tools/RunicFletcherTool.cs @@ -6,7 +6,7 @@ namespace Server.Items { public class RunicFletcherTool : BaseRunicTool { - public override CraftSystem CraftSystem{ get{ return DefBowFletching.CraftSystem; } } + public override CraftSystem CraftSystem => DefBowFletching.CraftSystem; public override int LabelNumber { @@ -16,11 +16,11 @@ namespace Server.Items if ( index >= 1 && index <= 6 ) return 1072627 + index; - + return 1044559; // Fletcher's Tools } } - + [Constructible] public RunicFletcherTool( CraftResource resource ) : base( resource, 0x1022 ) { diff --git a/Scripts/Items/Skill Items/Tools/RunicHammer.cs b/Scripts/Items/Skill Items/Tools/RunicHammer.cs index 673c32559..ff9f794f5 100644 --- a/Scripts/Items/Skill Items/Tools/RunicHammer.cs +++ b/Scripts/Items/Skill Items/Tools/RunicHammer.cs @@ -7,7 +7,7 @@ namespace Server.Items [FlippableAttribute( 0x13E4, 0x13E3 )] public class RunicHammer : BaseRunicTool { - public override CraftSystem CraftSystem{ get{ return DefBlacksmithy.CraftSystem; } } + public override CraftSystem CraftSystem => DefBlacksmithy.CraftSystem; public override int LabelNumber { @@ -76,4 +76,4 @@ namespace Server.Items int version = reader.ReadInt(); } } -} \ No newline at end of file +} diff --git a/Scripts/Items/Skill Items/Tools/RunicSewingKit.cs b/Scripts/Items/Skill Items/Tools/RunicSewingKit.cs index 945bedda3..8b796fbc9 100644 --- a/Scripts/Items/Skill Items/Tools/RunicSewingKit.cs +++ b/Scripts/Items/Skill Items/Tools/RunicSewingKit.cs @@ -6,7 +6,7 @@ namespace Server.Items { public class RunicSewingKit : BaseRunicTool { - public override CraftSystem CraftSystem{ get{ return DefTailoring.CraftSystem; } } + public override CraftSystem CraftSystem => DefTailoring.CraftSystem; public override void AddNameProperty( ObjectPropertyList list ) { @@ -77,4 +77,4 @@ namespace Server.Items ItemID = 0xF9D; } } -} \ No newline at end of file +} diff --git a/Scripts/Items/Skill Items/Tools/Saw.cs b/Scripts/Items/Skill Items/Tools/Saw.cs index 2dc07235d..92e028e2d 100644 --- a/Scripts/Items/Skill Items/Tools/Saw.cs +++ b/Scripts/Items/Skill Items/Tools/Saw.cs @@ -7,7 +7,7 @@ namespace Server.Items [FlippableAttribute( 0x1034, 0x1035 )] public class Saw : BaseTool { - public override CraftSystem CraftSystem{ get{ return DefCarpentry.CraftSystem; } } + public override CraftSystem CraftSystem => DefCarpentry.CraftSystem; [Constructible] public Saw() : base( 0x1034 ) @@ -39,4 +39,4 @@ namespace Server.Items int version = reader.ReadInt(); } } -} \ No newline at end of file +} diff --git a/Scripts/Items/Skill Items/Tools/Scorp.cs b/Scripts/Items/Skill Items/Tools/Scorp.cs index 422c60405..48b8ea781 100644 --- a/Scripts/Items/Skill Items/Tools/Scorp.cs +++ b/Scripts/Items/Skill Items/Tools/Scorp.cs @@ -6,7 +6,7 @@ namespace Server.Items { public class Scorp : BaseTool { - public override CraftSystem CraftSystem{ get{ return DefCarpentry.CraftSystem; } } + public override CraftSystem CraftSystem => DefCarpentry.CraftSystem; [Constructible] public Scorp() : base( 0x10E7 ) @@ -38,4 +38,4 @@ namespace Server.Items int version = reader.ReadInt(); } } -} \ No newline at end of file +} diff --git a/Scripts/Items/Skill Items/Tools/ScribesPen.cs b/Scripts/Items/Skill Items/Tools/ScribesPen.cs index f697f9832..2eff43073 100644 --- a/Scripts/Items/Skill Items/Tools/ScribesPen.cs +++ b/Scripts/Items/Skill Items/Tools/ScribesPen.cs @@ -7,9 +7,9 @@ namespace Server.Items [FlippableAttribute( 0x0FBF, 0x0FC0 )] public class ScribesPen : BaseTool { - public override CraftSystem CraftSystem{ get{ return DefInscription.CraftSystem; } } + public override CraftSystem CraftSystem => DefInscription.CraftSystem; - public override int LabelNumber{ get{ return 1044168; } } // scribe's pen + public override int LabelNumber => 1044168; // scribe's pen [Constructible] public ScribesPen() : base( 0x0FBF ) @@ -44,4 +44,4 @@ namespace Server.Items Weight = 1.0; } } -} \ No newline at end of file +} diff --git a/Scripts/Items/Skill Items/Tools/SewingKit.cs b/Scripts/Items/Skill Items/Tools/SewingKit.cs index 9724f5bbe..05d7c71db 100644 --- a/Scripts/Items/Skill Items/Tools/SewingKit.cs +++ b/Scripts/Items/Skill Items/Tools/SewingKit.cs @@ -6,7 +6,7 @@ namespace Server.Items { public class SewingKit : BaseTool { - public override CraftSystem CraftSystem{ get{ return DefTailoring.CraftSystem; } } + public override CraftSystem CraftSystem => DefTailoring.CraftSystem; [Constructible] public SewingKit() : base( 0xF9D ) @@ -38,4 +38,4 @@ namespace Server.Items int version = reader.ReadInt(); } } -} \ No newline at end of file +} diff --git a/Scripts/Items/Skill Items/Tools/Skillet.cs b/Scripts/Items/Skill Items/Tools/Skillet.cs index 77ab430c6..355190c49 100644 --- a/Scripts/Items/Skill Items/Tools/Skillet.cs +++ b/Scripts/Items/Skill Items/Tools/Skillet.cs @@ -6,9 +6,9 @@ namespace Server.Items { public class Skillet : BaseTool { - public override int LabelNumber{ get{ return 1044567; } } // skillet + public override int LabelNumber => 1044567; // skillet - public override CraftSystem CraftSystem{ get{ return DefCooking.CraftSystem; } } + public override CraftSystem CraftSystem => DefCooking.CraftSystem; [Constructible] public Skillet() : base( 0x97F ) @@ -40,4 +40,4 @@ namespace Server.Items int version = reader.ReadInt(); } } -} \ No newline at end of file +} diff --git a/Scripts/Items/Skill Items/Tools/SledgeHammer.cs b/Scripts/Items/Skill Items/Tools/SledgeHammer.cs index dcc9fd909..8340c3cd3 100644 --- a/Scripts/Items/Skill Items/Tools/SledgeHammer.cs +++ b/Scripts/Items/Skill Items/Tools/SledgeHammer.cs @@ -7,7 +7,7 @@ namespace Server.Items [FlippableAttribute( 0xFB5, 0xFB4 )] public class SledgeHammer : BaseTool { - public override CraftSystem CraftSystem{ get{ return DefBlacksmithy.CraftSystem; } } + public override CraftSystem CraftSystem => DefBlacksmithy.CraftSystem; [Constructible] public SledgeHammer() : base( 0xFB5 ) diff --git a/Scripts/Items/Skill Items/Tools/SmithHammer.cs b/Scripts/Items/Skill Items/Tools/SmithHammer.cs index 3a026d987..338d5d298 100644 --- a/Scripts/Items/Skill Items/Tools/SmithHammer.cs +++ b/Scripts/Items/Skill Items/Tools/SmithHammer.cs @@ -7,7 +7,7 @@ namespace Server.Items [FlippableAttribute( 0x13E3, 0x13E4 )] public class SmithHammer : BaseTool { - public override CraftSystem CraftSystem{ get{ return DefBlacksmithy.CraftSystem; } } + public override CraftSystem CraftSystem => DefBlacksmithy.CraftSystem; [Constructible] public SmithHammer() : base( 0x13E3 ) @@ -41,4 +41,4 @@ namespace Server.Items int version = reader.ReadInt(); } } -} \ No newline at end of file +} diff --git a/Scripts/Items/Skill Items/Tools/SmoothingPlane.cs b/Scripts/Items/Skill Items/Tools/SmoothingPlane.cs index daab606f3..d9f21d52d 100644 --- a/Scripts/Items/Skill Items/Tools/SmoothingPlane.cs +++ b/Scripts/Items/Skill Items/Tools/SmoothingPlane.cs @@ -7,7 +7,7 @@ namespace Server.Items [Flippable( 0x1032, 0x1033 )] public class SmoothingPlane : BaseTool { - public override CraftSystem CraftSystem{ get{ return DefCarpentry.CraftSystem; } } + public override CraftSystem CraftSystem => DefCarpentry.CraftSystem; [Constructible] public SmoothingPlane() : base( 0x1032 ) @@ -39,4 +39,4 @@ namespace Server.Items int version = reader.ReadInt(); } } -} \ No newline at end of file +} diff --git a/Scripts/Items/Skill Items/Tools/TinkerTools.cs b/Scripts/Items/Skill Items/Tools/TinkerTools.cs index 974e816d1..c71e08b23 100644 --- a/Scripts/Items/Skill Items/Tools/TinkerTools.cs +++ b/Scripts/Items/Skill Items/Tools/TinkerTools.cs @@ -7,7 +7,7 @@ namespace Server.Items [Flippable( 0x1EB8, 0x1EB9 )] public class TinkerTools : BaseTool { - public override CraftSystem CraftSystem{ get{ return DefTinkering.CraftSystem; } } + public override CraftSystem CraftSystem => DefTinkering.CraftSystem; [Constructible] public TinkerTools() : base( 0x1EB8 ) @@ -42,7 +42,7 @@ namespace Server.Items public class TinkersTools : BaseTool { - public override CraftSystem CraftSystem { get { return DefTinkering.CraftSystem; } } + public override CraftSystem CraftSystem => DefTinkering.CraftSystem; [Constructible] public TinkersTools() @@ -77,4 +77,4 @@ namespace Server.Items int version = reader.ReadInt(); } } -} \ No newline at end of file +} diff --git a/Scripts/Items/Skill Items/Tools/Tongs.cs b/Scripts/Items/Skill Items/Tools/Tongs.cs index e19c44b3d..32726b9fa 100644 --- a/Scripts/Items/Skill Items/Tools/Tongs.cs +++ b/Scripts/Items/Skill Items/Tools/Tongs.cs @@ -7,7 +7,7 @@ namespace Server.Items [FlippableAttribute( 0xfbb, 0xfbc )] public class Tongs : BaseTool { - public override CraftSystem CraftSystem{ get{ return DefBlacksmithy.CraftSystem; } } + public override CraftSystem CraftSystem => DefBlacksmithy.CraftSystem; [Constructible] public Tongs() : base( 0xFBB ) @@ -39,4 +39,4 @@ namespace Server.Items int version = reader.ReadInt(); } } -} \ No newline at end of file +} diff --git a/Scripts/Items/Special/11th Year promo/EarringsOfProtection.cs b/Scripts/Items/Special/11th Year promo/EarringsOfProtection.cs index 93f99e723..993d4b66d 100644 --- a/Scripts/Items/Special/11th Year promo/EarringsOfProtection.cs +++ b/Scripts/Items/Special/11th Year promo/EarringsOfProtection.cs @@ -8,7 +8,6 @@ namespace Server.Items { [Constructible] public EarringBoxSet() - : base() { DropItem( new EarringsOfProtection( AosElementAttribute.Physical ) ); DropItem( new EarringsOfProtection( AosElementAttribute.Fire ) ); @@ -133,4 +132,4 @@ namespace Server.Items } } } -} \ No newline at end of file +} diff --git a/Scripts/Items/Special/8th Anniversary Items/Dawn's Music Box/DawnsMusicBox.cs b/Scripts/Items/Special/8th Anniversary Items/Dawn's Music Box/DawnsMusicBox.cs index 9ea0ad97d..8135d5414 100644 --- a/Scripts/Items/Special/8th Anniversary Items/Dawn's Music Box/DawnsMusicBox.cs +++ b/Scripts/Items/Special/8th Anniversary Items/Dawn's Music Box/DawnsMusicBox.cs @@ -20,7 +20,7 @@ namespace Server.Items [Flippable( 0x2AF9, 0x2AFD )] public class DawnsMusicBox : Item, ISecurable { - public override int LabelNumber { get { return 1075198; } } // Dawn’s Music Box + public override int LabelNumber => 1075198; // Dawn�s Music Box private List m_Tracks; diff --git a/Scripts/Items/Special/8th Anniversary Items/DupresShield.cs b/Scripts/Items/Special/8th Anniversary Items/DupresShield.cs index 9c0742c8d..8c5f78662 100644 --- a/Scripts/Items/Special/8th Anniversary Items/DupresShield.cs +++ b/Scripts/Items/Special/8th Anniversary Items/DupresShield.cs @@ -5,20 +5,20 @@ namespace Server.Items { public class DupresShield : BaseShield, ITokunoDyable { - public override int LabelNumber { get { return 1075196; } } // Dupre’s Shield + public override int LabelNumber => 1075196; // Dupre�s Shield - public override int BasePhysicalResistance { get { return 1; } } - public override int BaseFireResistance { get { return 0; } } - public override int BaseColdResistance { get { return 0; } } - public override int BasePoisonResistance { get { return 0; } } - public override int BaseEnergyResistance { get { return 1; } } + public override int BasePhysicalResistance => 1; + public override int BaseFireResistance => 0; + public override int BaseColdResistance => 0; + public override int BasePoisonResistance => 0; + public override int BaseEnergyResistance => 1; - public override int InitMinHits { get { return 255; } } - public override int InitMaxHits { get { return 255; } } + public override int InitMinHits => 255; + public override int InitMaxHits => 255; - public override int AosStrReq { get { return 50; } } + public override int AosStrReq => 50; - public override int ArmorBase { get { return 15; } } + public override int ArmorBase => 15; [Constructible] public DupresShield() : base( 0x2B01 ) diff --git a/Scripts/Items/Special/8th Anniversary Items/FountainOfLife.cs b/Scripts/Items/Special/8th Anniversary Items/FountainOfLife.cs index fac7bcab7..846c7faa6 100644 --- a/Scripts/Items/Special/8th Anniversary Items/FountainOfLife.cs +++ b/Scripts/Items/Special/8th Anniversary Items/FountainOfLife.cs @@ -7,9 +7,9 @@ namespace Server.Items { public class EnhancedBandage : Bandage { - public static int HealingBonus { get { return 10; } } + public static int HealingBonus => 10; - public override int LabelNumber { get { return 1152441; } } // enhanced bandage + public override int LabelNumber => 1152441; // enhanced bandage [Constructible] public EnhancedBandage() @@ -71,10 +71,10 @@ namespace Server.Items public virtual TimeSpan RechargeTime { get { return TimeSpan.FromDays( 1 ); } } - public override int LabelNumber { get { return 1075197; } } // Fountain of Life - public override int DefaultGumpID { get { return 0x484; } } - public override int DefaultDropSound { get { return 66; } } - public override int DefaultMaxItems { get { return 125; } } + public override int LabelNumber => 1075197; // Fountain of Life + public override int DefaultGumpID => 0x484; + public override int DefaultDropSound => 66; + public override int DefaultMaxItems => 125; private int m_Charges; @@ -228,8 +228,8 @@ namespace Server.Items public class FountainOfLifeDeed : BaseAddonContainerDeed { - public override int LabelNumber { get { return 1075197; } } // Fountain of Life - public override BaseAddonContainer Addon { get { return new FountainOfLife( m_Charges ); } } + public override int LabelNumber => 1075197; // Fountain of Life + public override BaseAddonContainer Addon => new FountainOfLife( m_Charges ); private int m_Charges; @@ -248,7 +248,6 @@ namespace Server.Items [Constructible] public FountainOfLifeDeed( int charges ) - : base() { LootType = LootType.Blessed; m_Charges = charges; @@ -277,4 +276,4 @@ namespace Server.Items m_Charges = reader.ReadInt(); } } -} \ No newline at end of file +} diff --git a/Scripts/Items/Special/8th Anniversary Items/OssianGrimoire.cs b/Scripts/Items/Special/8th Anniversary Items/OssianGrimoire.cs index 58d647d4e..4de9002ca 100644 --- a/Scripts/Items/Special/8th Anniversary Items/OssianGrimoire.cs +++ b/Scripts/Items/Special/8th Anniversary Items/OssianGrimoire.cs @@ -4,7 +4,7 @@ namespace Server.Items { public class OssianGrimoire : NecromancerSpellbook, ITokunoDyable { - public override int LabelNumber { get { return 1078148; } } // Ossian Grimoire + public override int LabelNumber => 1078148; // Ossian Grimoire [Constructible] public OssianGrimoire() diff --git a/Scripts/Items/Special/8th Anniversary Items/QuiverOfInfinity.cs b/Scripts/Items/Special/8th Anniversary Items/QuiverOfInfinity.cs index ec7bb706b..d1c416525 100644 --- a/Scripts/Items/Special/8th Anniversary Items/QuiverOfInfinity.cs +++ b/Scripts/Items/Special/8th Anniversary Items/QuiverOfInfinity.cs @@ -4,7 +4,7 @@ namespace Server.Items { public class QuiverOfInfinity : BaseQuiver, ITokunoDyable { - public override int LabelNumber { get { return 1075201; } } // Quiver of Infinity + public override int LabelNumber => 1075201; // Quiver of Infinity [Constructible] public QuiverOfInfinity() : base( 0x2B02 ) diff --git a/Scripts/Items/Special/8th Anniversary Items/Talismans.cs b/Scripts/Items/Special/8th Anniversary Items/Talismans.cs index 76dbba13c..e92377bf6 100644 --- a/Scripts/Items/Special/8th Anniversary Items/Talismans.cs +++ b/Scripts/Items/Special/8th Anniversary Items/Talismans.cs @@ -14,7 +14,7 @@ namespace Server.Items public class BaseFormTalisman : Item, ITokunoDyable { - public virtual TalismanForm Form { get { return TalismanForm.Squirrel; } } + public virtual TalismanForm Form => TalismanForm.Squirrel; public BaseFormTalisman() : base( 0x2F59 ) { @@ -75,10 +75,10 @@ namespace Server.Items public class FerretFormTalisman : BaseFormTalisman { - public override TalismanForm Form { get { return TalismanForm.Ferret; } } + public override TalismanForm Form => TalismanForm.Ferret; [Constructible] - public FerretFormTalisman() : base() + public FerretFormTalisman() { } @@ -103,10 +103,10 @@ namespace Server.Items public class SquirrelFormTalisman : BaseFormTalisman { - public override TalismanForm Form { get { return TalismanForm.Squirrel; } } + public override TalismanForm Form => TalismanForm.Squirrel; [Constructible] - public SquirrelFormTalisman () : base() + public SquirrelFormTalisman () { } @@ -131,10 +131,10 @@ namespace Server.Items public class CuSidheFormTalisman : BaseFormTalisman { - public override TalismanForm Form { get { return TalismanForm.CuSidhe; } } + public override TalismanForm Form => TalismanForm.CuSidhe; [Constructible] - public CuSidheFormTalisman() : base() + public CuSidheFormTalisman() { } @@ -159,10 +159,10 @@ namespace Server.Items public class ReptalonFormTalisman : BaseFormTalisman { - public override TalismanForm Form { get { return TalismanForm.Reptalon; } } + public override TalismanForm Form => TalismanForm.Reptalon; [Constructible] - public ReptalonFormTalisman() : base() + public ReptalonFormTalisman() { } diff --git a/Scripts/Items/Special/AoS Promotional/LuckyNecklace.cs b/Scripts/Items/Special/AoS Promotional/LuckyNecklace.cs index 1023c80c0..de5d65939 100644 --- a/Scripts/Items/Special/AoS Promotional/LuckyNecklace.cs +++ b/Scripts/Items/Special/AoS Promotional/LuckyNecklace.cs @@ -5,8 +5,8 @@ namespace Server.Items { public class LuckyNecklace : BaseJewel { - public override int Hue{ get { return 1150; } } - public override int LabelNumber{ get { return 1075239; } } //Lucky Necklace 1075239 + public override int Hue => 1150; + public override int LabelNumber => 1075239; //Lucky Necklace 1075239 [Constructible] public LuckyNecklace( ) diff --git a/Scripts/Items/Special/Broken Furniture Collection/BrokenArmoire.cs b/Scripts/Items/Special/Broken Furniture Collection/BrokenArmoire.cs index 332251812..23a897808 100644 --- a/Scripts/Items/Special/Broken Furniture Collection/BrokenArmoire.cs +++ b/Scripts/Items/Special/Broken Furniture Collection/BrokenArmoire.cs @@ -5,7 +5,7 @@ namespace Server.Items [Flippable( 0xC12, 0xC13 )] public class BrokenArmoireComponent : AddonComponent { - public override int LabelNumber { get { return 1076262; } } // Broken Armoire + public override int LabelNumber => 1076262; // Broken Armoire public BrokenArmoireComponent() : base( 0xC12 ) { @@ -32,10 +32,10 @@ namespace Server.Items public class BrokenArmoireAddon : BaseAddon { - public override BaseAddonDeed Deed { get { return new BrokenArmoireDeed(); } } + public override BaseAddonDeed Deed => new BrokenArmoireDeed(); [Constructible] - public BrokenArmoireAddon() : base() + public BrokenArmoireAddon() { AddComponent( new BrokenArmoireComponent(), 0, 0, 0 ); } @@ -61,11 +61,11 @@ namespace Server.Items public class BrokenArmoireDeed : BaseAddonDeed { - public override BaseAddon Addon { get { return new BrokenArmoireAddon(); } } - public override int LabelNumber { get { return 1076262; } } // Broken Armoire + public override BaseAddon Addon => new BrokenArmoireAddon(); + public override int LabelNumber => 1076262; // Broken Armoire [Constructible] - public BrokenArmoireDeed() : base() + public BrokenArmoireDeed() { LootType = LootType.Blessed; } diff --git a/Scripts/Items/Special/Broken Furniture Collection/BrokenBed.cs b/Scripts/Items/Special/Broken Furniture Collection/BrokenBed.cs index 2819a26ed..b82824117 100644 --- a/Scripts/Items/Special/Broken Furniture Collection/BrokenBed.cs +++ b/Scripts/Items/Special/Broken Furniture Collection/BrokenBed.cs @@ -7,10 +7,10 @@ namespace Server.Items { public class BrokenBedAddon : BaseAddon { - public override BaseAddonDeed Deed { get { return new BrokenBedDeed(); } } + public override BaseAddonDeed Deed => new BrokenBedDeed(); [Constructible] - public BrokenBedAddon( bool east ) : base() + public BrokenBedAddon( bool east ) { if ( east ) // east { @@ -49,13 +49,13 @@ namespace Server.Items public class BrokenBedDeed : BaseAddonDeed { - public override BaseAddon Addon { get { return new BrokenBedAddon( m_East ); } } - public override int LabelNumber { get { return 1076263; } } // Broken Bed + public override BaseAddon Addon => new BrokenBedAddon( m_East ); + public override int LabelNumber => 1076263; // Broken Bed private bool m_East; [Constructible] - public BrokenBedDeed() : base() + public BrokenBedDeed() { LootType = LootType.Blessed; } diff --git a/Scripts/Items/Special/Broken Furniture Collection/BrokenBookcase.cs b/Scripts/Items/Special/Broken Furniture Collection/BrokenBookcase.cs index 41e46ab31..160de54aa 100644 --- a/Scripts/Items/Special/Broken Furniture Collection/BrokenBookcase.cs +++ b/Scripts/Items/Special/Broken Furniture Collection/BrokenBookcase.cs @@ -5,7 +5,7 @@ namespace Server.Items [Flippable( 0xC14, 0xC15 )] public class BrokenBookcaseComponent : AddonComponent { - public override int LabelNumber { get { return 1076258; } } // Broken Bookcase + public override int LabelNumber => 1076258; // Broken Bookcase public BrokenBookcaseComponent() : base( 0xC14 ) { @@ -32,10 +32,10 @@ namespace Server.Items public class BrokenBookcaseAddon : BaseAddon { - public override BaseAddonDeed Deed { get { return new BrokenBookcaseDeed(); } } + public override BaseAddonDeed Deed => new BrokenBookcaseDeed(); [Constructible] - public BrokenBookcaseAddon() : base() + public BrokenBookcaseAddon() { AddComponent( new BrokenBookcaseComponent(), 0, 0, 0 ); } @@ -61,11 +61,11 @@ namespace Server.Items public class BrokenBookcaseDeed : BaseAddonDeed { - public override BaseAddon Addon { get { return new BrokenBookcaseAddon(); } } - public override int LabelNumber { get { return 1076258; } } // Broken Bookcase + public override BaseAddon Addon => new BrokenBookcaseAddon(); + public override int LabelNumber => 1076258; // Broken Bookcase [Constructible] - public BrokenBookcaseDeed() : base() + public BrokenBookcaseDeed() { LootType = LootType.Blessed; } diff --git a/Scripts/Items/Special/Broken Furniture Collection/BrokenChestOfDrawers.cs b/Scripts/Items/Special/Broken Furniture Collection/BrokenChestOfDrawers.cs index 881e28927..4c37362a7 100644 --- a/Scripts/Items/Special/Broken Furniture Collection/BrokenChestOfDrawers.cs +++ b/Scripts/Items/Special/Broken Furniture Collection/BrokenChestOfDrawers.cs @@ -5,7 +5,7 @@ namespace Server.Items [Flippable( 0xC24, 0xC25 )] public class BrokenChestOfDrawersComponent : AddonComponent { - public override int LabelNumber { get { return 1076261; } } // Broken Chest of Drawers + public override int LabelNumber => 1076261; // Broken Chest of Drawers public BrokenChestOfDrawersComponent() : base( 0xC24 ) { @@ -32,10 +32,10 @@ namespace Server.Items public class BrokenChestOfDrawersAddon : BaseAddon { - public override BaseAddonDeed Deed { get { return new BrokenChestOfDrawersDeed(); } } + public override BaseAddonDeed Deed => new BrokenChestOfDrawersDeed(); [Constructible] - public BrokenChestOfDrawersAddon() : base() + public BrokenChestOfDrawersAddon() { AddComponent( new BrokenChestOfDrawersComponent(), 0, 0, 0 ); } @@ -61,11 +61,11 @@ namespace Server.Items public class BrokenChestOfDrawersDeed : BaseAddonDeed { - public override BaseAddon Addon { get { return new BrokenChestOfDrawersAddon(); } } - public override int LabelNumber { get { return 1076261; } } // Broken Chest of Drawers + public override BaseAddon Addon => new BrokenChestOfDrawersAddon(); + public override int LabelNumber => 1076261; // Broken Chest of Drawers [Constructible] - public BrokenChestOfDrawersDeed() : base() + public BrokenChestOfDrawersDeed() { LootType = LootType.Blessed; } diff --git a/Scripts/Items/Special/Broken Furniture Collection/BrokenCoveredChair.cs b/Scripts/Items/Special/Broken Furniture Collection/BrokenCoveredChair.cs index e2fa5a211..6a61bebe8 100644 --- a/Scripts/Items/Special/Broken Furniture Collection/BrokenCoveredChair.cs +++ b/Scripts/Items/Special/Broken Furniture Collection/BrokenCoveredChair.cs @@ -5,7 +5,7 @@ namespace Server.Items [Flippable( 0xC17, 0xC18 )] public class BrokenCoveredChairComponent : AddonComponent { - public override int LabelNumber { get { return 1076257; } } // Broken Covered Chair + public override int LabelNumber => 1076257; // Broken Covered Chair public BrokenCoveredChairComponent() : base( 0xC17 ) { @@ -32,10 +32,10 @@ namespace Server.Items public class BrokenCoveredChairAddon : BaseAddon { - public override BaseAddonDeed Deed { get { return new BrokenCoveredChairDeed(); } } + public override BaseAddonDeed Deed => new BrokenCoveredChairDeed(); [Constructible] - public BrokenCoveredChairAddon() : base() + public BrokenCoveredChairAddon() { AddComponent( new BrokenCoveredChairComponent(), 0, 0, 0 ); } @@ -61,11 +61,11 @@ namespace Server.Items public class BrokenCoveredChairDeed : BaseAddonDeed { - public override BaseAddon Addon { get { return new BrokenCoveredChairAddon(); } } - public override int LabelNumber { get { return 1076257; } } // Broken Covered Chair + public override BaseAddon Addon => new BrokenCoveredChairAddon(); + public override int LabelNumber => 1076257; // Broken Covered Chair [Constructible] - public BrokenCoveredChairDeed() : base() + public BrokenCoveredChairDeed() { LootType = LootType.Blessed; } diff --git a/Scripts/Items/Special/Broken Furniture Collection/BrokenFallenChair.cs b/Scripts/Items/Special/Broken Furniture Collection/BrokenFallenChair.cs index aea10f43d..7135bdffe 100644 --- a/Scripts/Items/Special/Broken Furniture Collection/BrokenFallenChair.cs +++ b/Scripts/Items/Special/Broken Furniture Collection/BrokenFallenChair.cs @@ -5,7 +5,7 @@ namespace Server.Items [Flippable( 0xC19, 0xC1A )] public class BrokenFallenChairComponent : AddonComponent { - public override int LabelNumber { get { return 1076264; } } // Broken Fallen Chair + public override int LabelNumber => 1076264; // Broken Fallen Chair public BrokenFallenChairComponent() : base( 0xC19 ) { @@ -35,10 +35,10 @@ namespace Server.Items public class BrokenFallenChairAddon : BaseAddon { - public override BaseAddonDeed Deed { get { return new BrokenFallenChairDeed(); } } + public override BaseAddonDeed Deed => new BrokenFallenChairDeed(); [Constructible] - public BrokenFallenChairAddon() : base() + public BrokenFallenChairAddon() { AddComponent( new BrokenFallenChairComponent(), 0, 0, 0 ); } @@ -64,11 +64,11 @@ namespace Server.Items public class BrokenFallenChairDeed : BaseAddonDeed { - public override BaseAddon Addon { get { return new BrokenFallenChairAddon(); } } - public override int LabelNumber { get { return 1076264; } } // Broken Fallen Chair + public override BaseAddon Addon => new BrokenFallenChairAddon(); + public override int LabelNumber => 1076264; // Broken Fallen Chair [Constructible] - public BrokenFallenChairDeed() : base() + public BrokenFallenChairDeed() { LootType = LootType.Blessed; } diff --git a/Scripts/Items/Special/Broken Furniture Collection/BrokenVanity.cs b/Scripts/Items/Special/Broken Furniture Collection/BrokenVanity.cs index 5db8f27b4..835c3a0f6 100644 --- a/Scripts/Items/Special/Broken Furniture Collection/BrokenVanity.cs +++ b/Scripts/Items/Special/Broken Furniture Collection/BrokenVanity.cs @@ -7,10 +7,10 @@ namespace Server.Items { public class BrokenVanityAddon : BaseAddon { - public override BaseAddonDeed Deed { get { return new BrokenVanityDeed(); } } + public override BaseAddonDeed Deed => new BrokenVanityDeed(); [Constructible] - public BrokenVanityAddon( bool east ) : base() + public BrokenVanityAddon( bool east ) { if ( east ) // east { @@ -45,13 +45,13 @@ namespace Server.Items public class BrokenVanityDeed : BaseAddonDeed { - public override BaseAddon Addon { get { return new BrokenVanityAddon( m_East ); } } - public override int LabelNumber { get { return 1076260; } } // Broken Vanity + public override BaseAddon Addon => new BrokenVanityAddon( m_East ); + public override int LabelNumber => 1076260; // Broken Vanity private bool m_East; [Constructible] - public BrokenVanityDeed() : base() + public BrokenVanityDeed() { LootType = LootType.Blessed; } diff --git a/Scripts/Items/Special/Broken Furniture Collection/StandingBrokenChair.cs b/Scripts/Items/Special/Broken Furniture Collection/StandingBrokenChair.cs index 4d4985452..e5f491705 100644 --- a/Scripts/Items/Special/Broken Furniture Collection/StandingBrokenChair.cs +++ b/Scripts/Items/Special/Broken Furniture Collection/StandingBrokenChair.cs @@ -5,7 +5,7 @@ namespace Server.Items [Flippable( 0xC1B, 0xC1C, 0xC1E, 0xC1D )] public class StandingBrokenChairComponent : AddonComponent { - public override int LabelNumber { get { return 1076259; } } // Standing Broken Chair + public override int LabelNumber => 1076259; // Standing Broken Chair public StandingBrokenChairComponent() : base( 0xC1B ) { @@ -32,10 +32,10 @@ namespace Server.Items public class StandingBrokenChairAddon : BaseAddon { - public override BaseAddonDeed Deed { get { return new StandingBrokenChairDeed(); } } + public override BaseAddonDeed Deed => new StandingBrokenChairDeed(); [Constructible] - public StandingBrokenChairAddon() : base() + public StandingBrokenChairAddon() { AddComponent( new StandingBrokenChairComponent(), 0, 0, 0 ); } @@ -61,11 +61,11 @@ namespace Server.Items public class StandingBrokenChairDeed : BaseAddonDeed { - public override BaseAddon Addon { get { return new StandingBrokenChairAddon(); } } - public override int LabelNumber { get { return 1076259; } } // Standing Broken Chair + public override BaseAddon Addon => new StandingBrokenChairAddon(); + public override int LabelNumber => 1076259; // Standing Broken Chair [Constructible] - public StandingBrokenChairDeed() : base() + public StandingBrokenChairDeed() { LootType = LootType.Blessed; } diff --git a/Scripts/Items/Special/Bulk Order Rewards/Blacksmithy/AncientSmithyHammer.cs b/Scripts/Items/Special/Bulk Order Rewards/Blacksmithy/AncientSmithyHammer.cs index e83b43345..b977fada6 100644 --- a/Scripts/Items/Special/Bulk Order Rewards/Blacksmithy/AncientSmithyHammer.cs +++ b/Scripts/Items/Special/Bulk Order Rewards/Blacksmithy/AncientSmithyHammer.cs @@ -65,8 +65,8 @@ namespace Server.Items m_SkillMod = null; } - public override CraftSystem CraftSystem{ get{ return DefBlacksmithy.CraftSystem; } } - public override int LabelNumber{ get{ return 1045127; } } // ancient smithy hammer + public override CraftSystem CraftSystem => DefBlacksmithy.CraftSystem; + public override int LabelNumber => 1045127; // ancient smithy hammer [Constructible] public AncientSmithyHammer( int bonus ) : this( bonus, 600 ) @@ -131,4 +131,4 @@ namespace Server.Items Hue = 0x482; } } -} \ No newline at end of file +} diff --git a/Scripts/Items/Special/Bulk Order Rewards/Blacksmithy/GlovesOfMining.cs b/Scripts/Items/Special/Bulk Order Rewards/Blacksmithy/GlovesOfMining.cs index e08007fa3..f21bf5f91 100644 --- a/Scripts/Items/Special/Bulk Order Rewards/Blacksmithy/GlovesOfMining.cs +++ b/Scripts/Items/Special/Bulk Order Rewards/Blacksmithy/GlovesOfMining.cs @@ -5,26 +5,26 @@ namespace Server.Items [FlippableAttribute( 0x13c6, 0x13ce )] public class LeatherGlovesOfMining : BaseGlovesOfMining { - public override int BasePhysicalResistance{ get{ return 2; } } - public override int BaseFireResistance{ get{ return 4; } } - public override int BaseColdResistance{ get{ return 3; } } - public override int BasePoisonResistance{ get{ return 3; } } - public override int BaseEnergyResistance{ get{ return 3; } } + public override int BasePhysicalResistance => 2; + public override int BaseFireResistance => 4; + public override int BaseColdResistance => 3; + public override int BasePoisonResistance => 3; + public override int BaseEnergyResistance => 3; - public override int InitMinHits{ get{ return 30; } } - public override int InitMaxHits{ get{ return 40; } } + public override int InitMinHits => 30; + public override int InitMaxHits => 40; - public override int AosStrReq{ get{ return 20; } } - public override int OldStrReq{ get{ return 10; } } + public override int AosStrReq => 20; + public override int OldStrReq => 10; - public override int ArmorBase{ get{ return 13; } } + public override int ArmorBase => 13; - public override ArmorMaterialType MaterialType{ get{ return ArmorMaterialType.Leather; } } - public override CraftResource DefaultResource{ get{ return CraftResource.RegularLeather; } } + public override ArmorMaterialType MaterialType => ArmorMaterialType.Leather; + public override CraftResource DefaultResource => CraftResource.RegularLeather; - public override ArmorMeditationAllowance DefMedAllowance{ get{ return ArmorMeditationAllowance.All; } } + public override ArmorMeditationAllowance DefMedAllowance => ArmorMeditationAllowance.All; - public override int LabelNumber{ get{ return 1045122; } } // leather blacksmith gloves of mining + public override int LabelNumber => 1045122; // leather blacksmith gloves of mining [Constructible] public LeatherGlovesOfMining( int bonus ) : base( bonus, 0x13C6 ) @@ -35,13 +35,13 @@ namespace Server.Items public LeatherGlovesOfMining( Serial serial ) : base( serial ) { } - + public override void Serialize( GenericWriter writer ) { base.Serialize( writer ); writer.Write( (int) 0 ); } - + public override void Deserialize(GenericReader reader) { base.Deserialize( reader ); @@ -52,24 +52,24 @@ namespace Server.Items [FlippableAttribute( 0x13d5, 0x13dd )] public class StuddedGlovesOfMining : BaseGlovesOfMining { - public override int BasePhysicalResistance{ get{ return 2; } } - public override int BaseFireResistance{ get{ return 4; } } - public override int BaseColdResistance{ get{ return 3; } } - public override int BasePoisonResistance{ get{ return 3; } } - public override int BaseEnergyResistance{ get{ return 4; } } + public override int BasePhysicalResistance => 2; + public override int BaseFireResistance => 4; + public override int BaseColdResistance => 3; + public override int BasePoisonResistance => 3; + public override int BaseEnergyResistance => 4; - public override int InitMinHits{ get{ return 35; } } - public override int InitMaxHits{ get{ return 45; } } + public override int InitMinHits => 35; + public override int InitMaxHits => 45; - public override int AosStrReq{ get{ return 25; } } - public override int OldStrReq{ get{ return 25; } } + public override int AosStrReq => 25; + public override int OldStrReq => 25; - public override int ArmorBase{ get{ return 16; } } + public override int ArmorBase => 16; - public override ArmorMaterialType MaterialType{ get{ return ArmorMaterialType.Studded; } } - public override CraftResource DefaultResource{ get{ return CraftResource.RegularLeather; } } + public override ArmorMaterialType MaterialType => ArmorMaterialType.Studded; + public override CraftResource DefaultResource => CraftResource.RegularLeather; - public override int LabelNumber{ get{ return 1045123; } } // studded leather blacksmith gloves of mining + public override int LabelNumber => 1045123; // studded leather blacksmith gloves of mining [Constructible] public StuddedGlovesOfMining( int bonus ) : base( bonus, 0x13D5 ) @@ -80,13 +80,13 @@ namespace Server.Items public StuddedGlovesOfMining( Serial serial ) : base( serial ) { } - + public override void Serialize( GenericWriter writer ) { base.Serialize( writer ); writer.Write( (int) 0 ); } - + public override void Deserialize(GenericReader reader) { base.Deserialize( reader ); @@ -97,25 +97,25 @@ namespace Server.Items [FlippableAttribute( 0x13eb, 0x13f2 )] public class RingmailGlovesOfMining : BaseGlovesOfMining { - public override int BasePhysicalResistance{ get{ return 3; } } - public override int BaseFireResistance{ get{ return 3; } } - public override int BaseColdResistance{ get{ return 1; } } - public override int BasePoisonResistance{ get{ return 5; } } - public override int BaseEnergyResistance{ get{ return 3; } } + public override int BasePhysicalResistance => 3; + public override int BaseFireResistance => 3; + public override int BaseColdResistance => 1; + public override int BasePoisonResistance => 5; + public override int BaseEnergyResistance => 3; - public override int InitMinHits{ get{ return 40; } } - public override int InitMaxHits{ get{ return 50; } } + public override int InitMinHits => 40; + public override int InitMaxHits => 50; - public override int AosStrReq{ get{ return 40; } } - public override int OldStrReq{ get{ return 20; } } + public override int AosStrReq => 40; + public override int OldStrReq => 20; - public override int OldDexBonus{ get{ return -1; } } + public override int OldDexBonus => -1; - public override int ArmorBase{ get{ return 22; } } + public override int ArmorBase => 22; - public override ArmorMaterialType MaterialType{ get{ return ArmorMaterialType.Ringmail; } } + public override ArmorMaterialType MaterialType => ArmorMaterialType.Ringmail; - public override int LabelNumber{ get{ return 1045124; } } // ringmail blacksmith gloves of mining + public override int LabelNumber => 1045124; // ringmail blacksmith gloves of mining [Constructible] public RingmailGlovesOfMining( int bonus ) : base( bonus, 0x13EB ) @@ -126,13 +126,13 @@ namespace Server.Items public RingmailGlovesOfMining( Serial serial ) : base( serial ) { } - + public override void Serialize( GenericWriter writer ) { base.Serialize( writer ); writer.Write( (int) 0 ); } - + public override void Deserialize(GenericReader reader) { base.Deserialize( reader ); @@ -253,4 +253,4 @@ namespace Server.Items } } } -} \ No newline at end of file +} diff --git a/Scripts/Items/Special/Bulk Order Rewards/Blacksmithy/PowderOfTemperament.cs b/Scripts/Items/Special/Bulk Order Rewards/Blacksmithy/PowderOfTemperament.cs index e0726966b..2078d4c76 100644 --- a/Scripts/Items/Special/Bulk Order Rewards/Blacksmithy/PowderOfTemperament.cs +++ b/Scripts/Items/Special/Bulk Order Rewards/Blacksmithy/PowderOfTemperament.cs @@ -19,7 +19,7 @@ namespace Server.Items public bool ShowUsesRemaining{ get{ return true; } set{} } - public override int LabelNumber{ get{ return 1049082; } } // powder of fortifying + public override int LabelNumber => 1049082; // powder of fortifying [Constructible] public PowderOfTemperament() : this( 10 ) @@ -37,7 +37,7 @@ namespace Server.Items public PowderOfTemperament( Serial serial ) : base( serial ) { } - + public override void Serialize( GenericWriter writer ) { base.Serialize( writer ); @@ -45,7 +45,7 @@ namespace Server.Items writer.Write( (int) 0 ); writer.Write( (int) m_UsesRemaining ); } - + public override void Deserialize(GenericReader reader) { base.Deserialize( reader ); @@ -186,4 +186,4 @@ namespace Server.Items } } } -} \ No newline at end of file +} diff --git a/Scripts/Items/Special/Community Collection/JesterHatofChuckles.cs b/Scripts/Items/Special/Community Collection/JesterHatofChuckles.cs index e5e4b808f..3d7be9051 100644 --- a/Scripts/Items/Special/Community Collection/JesterHatofChuckles.cs +++ b/Scripts/Items/Special/Community Collection/JesterHatofChuckles.cs @@ -6,16 +6,16 @@ namespace Server.Items { public class JesterHatofChuckles : BaseHat, ITokunoDyable { - public override int LabelNumber { get { return 1073256; } } //Jester Hat of Chuckles - Museum of Vesper Replica 1073256 + public override int LabelNumber => 1073256; //Jester Hat of Chuckles - Museum of Vesper Replica 1073256 - public override int BasePhysicalResistance { get { return 12; } } - public override int BaseFireResistance { get { return 12; } } - public override int BaseColdResistance { get { return 12; } } - public override int BasePoisonResistance { get { return 12; } } - public override int BaseEnergyResistance { get { return 12; } } + public override int BasePhysicalResistance => 12; + public override int BaseFireResistance => 12; + public override int BaseColdResistance => 12; + public override int BasePoisonResistance => 12; + public override int BaseEnergyResistance => 12; - public override int InitMinHits{ get{ return 100; } } - public override int InitMaxHits{ get{ return 100; } } + public override int InitMinHits => 100; + public override int InitMaxHits => 100; [Constructible] public JesterHatofChuckles() : this( Utility.RandomList( 0x13e, 0x03, 0x172, 0x3f ) ) diff --git a/Scripts/Items/Special/Evil Home Decor Collection/AwesomeDisturbingPortrait.cs b/Scripts/Items/Special/Evil Home Decor Collection/AwesomeDisturbingPortrait.cs index 2d84b30eb..29fd9fda8 100644 --- a/Scripts/Items/Special/Evil Home Decor Collection/AwesomeDisturbingPortrait.cs +++ b/Scripts/Items/Special/Evil Home Decor Collection/AwesomeDisturbingPortrait.cs @@ -7,7 +7,7 @@ namespace Server.Items [Flippable( 0x2A5D, 0x2A61 )] public class AwesomeDisturbingPortraitComponent : AddonComponent { - public override int LabelNumber { get { return 1074479; } } // Disturbing portrait + public override int LabelNumber => 1074479; // Disturbing portrait public bool FacingSouth { get { return ItemID < 0x2A61; } } private InternalTimer m_Timer; @@ -129,10 +129,10 @@ namespace Server.Items public class AwesomeDisturbingPortraitAddon : BaseAddon { - public override BaseAddonDeed Deed { get { return new AwesomeDisturbingPortraitDeed(); } } + public override BaseAddonDeed Deed => new AwesomeDisturbingPortraitDeed(); [Constructible] - public AwesomeDisturbingPortraitAddon() : base() + public AwesomeDisturbingPortraitAddon() { AddComponent( new AwesomeDisturbingPortraitComponent(), 0, 0, 0 ); } @@ -158,11 +158,11 @@ namespace Server.Items public class AwesomeDisturbingPortraitDeed : BaseAddonDeed { - public override BaseAddon Addon { get { return new AwesomeDisturbingPortraitAddon(); } } - public override int LabelNumber { get { return 1074479; } } // Disturbing portrait + public override BaseAddon Addon => new AwesomeDisturbingPortraitAddon(); + public override int LabelNumber => 1074479; // Disturbing portrait [Constructible] - public AwesomeDisturbingPortraitDeed() : base() + public AwesomeDisturbingPortraitDeed() { LootType = LootType.Blessed; } diff --git a/Scripts/Items/Special/Evil Home Decor Collection/BedOfNails.cs b/Scripts/Items/Special/Evil Home Decor Collection/BedOfNails.cs index 087830691..82c8e27e5 100644 --- a/Scripts/Items/Special/Evil Home Decor Collection/BedOfNails.cs +++ b/Scripts/Items/Special/Evil Home Decor Collection/BedOfNails.cs @@ -4,7 +4,7 @@ namespace Server.Items { public class BedOfNailsComponent : AddonComponent { - public override int LabelNumber { get { return 1074801; } } // Bed of Nails + public override int LabelNumber => 1074801; // Bed of Nails public BedOfNailsComponent( int itemID ) : base( itemID ) @@ -44,13 +44,12 @@ namespace Server.Items [FlippableAddon( Direction.South, Direction.East )] public class BedOfNailsAddon : BaseAddon { - public override BaseAddonDeed Deed { get { return new BedOfNailsDeed(); } } + public override BaseAddonDeed Deed => new BedOfNailsDeed(); private InternalTimer m_Timer; [Constructible] public BedOfNailsAddon() - : base() { Direction = Direction.South; @@ -163,12 +162,11 @@ namespace Server.Items public class BedOfNailsDeed : BaseAddonDeed { - public override BaseAddon Addon { get { return new BedOfNailsAddon(); } } - public override int LabelNumber { get { return 1074801; } } // Bed of Nails + public override BaseAddon Addon => new BedOfNailsAddon(); + public override int LabelNumber => 1074801; // Bed of Nails [Constructible] public BedOfNailsDeed() - : base() { LootType = LootType.Blessed; } @@ -192,4 +190,4 @@ namespace Server.Items int version = reader.ReadEncodedInt(); } } -} \ No newline at end of file +} diff --git a/Scripts/Items/Special/Evil Home Decor Collection/BoneCouch.cs b/Scripts/Items/Special/Evil Home Decor Collection/BoneCouch.cs index 7710dd12e..05e410cb2 100644 --- a/Scripts/Items/Special/Evil Home Decor Collection/BoneCouch.cs +++ b/Scripts/Items/Special/Evil Home Decor Collection/BoneCouch.cs @@ -4,7 +4,7 @@ namespace Server.Items { public class BoneCouchComponent : AddonComponent { - public override int LabelNumber { get { return 1074477; } } // Bone couch + public override int LabelNumber => 1074477; // Bone couch public BoneCouchComponent( int itemID ) : base( itemID ) { @@ -42,10 +42,10 @@ namespace Server.Items [FlippableAddon( Direction.South, Direction.East )] public class BoneCouchAddon : BaseAddon { - public override BaseAddonDeed Deed { get { return new BoneCouchDeed(); } } + public override BaseAddonDeed Deed => new BoneCouchDeed(); [Constructible] - public BoneCouchAddon() : base() + public BoneCouchAddon() { Direction = Direction.South; @@ -89,11 +89,11 @@ namespace Server.Items public class BoneCouchDeed : BaseAddonDeed { - public override BaseAddon Addon { get { return new BoneCouchAddon(); } } - public override int LabelNumber { get { return 1074477; } } // Bone couch + public override BaseAddon Addon => new BoneCouchAddon(); + public override int LabelNumber => 1074477; // Bone couch [Constructible] - public BoneCouchDeed() : base() + public BoneCouchDeed() { LootType = LootType.Blessed; } diff --git a/Scripts/Items/Special/Evil Home Decor Collection/BoneTable.cs b/Scripts/Items/Special/Evil Home Decor Collection/BoneTable.cs index 614b3800b..38dde3a0f 100644 --- a/Scripts/Items/Special/Evil Home Decor Collection/BoneTable.cs +++ b/Scripts/Items/Special/Evil Home Decor Collection/BoneTable.cs @@ -4,10 +4,10 @@ namespace Server.Items { public class BoneTableAddon : BaseAddon { - public override BaseAddonDeed Deed { get { return new BoneTableDeed(); } } + public override BaseAddonDeed Deed => new BoneTableDeed(); [Constructible] - public BoneTableAddon() : base() + public BoneTableAddon() { AddComponent( new LocalizedAddonComponent( 0x2A5C, 1074478 ), 0, 0, 0 ); } @@ -33,11 +33,11 @@ namespace Server.Items public class BoneTableDeed : BaseAddonDeed { - public override BaseAddon Addon { get { return new BoneTableAddon(); } } - public override int LabelNumber { get { return 1074478; } } // Bone table + public override BaseAddon Addon => new BoneTableAddon(); + public override int LabelNumber => 1074478; // Bone table [Constructible] - public BoneTableDeed() : base() + public BoneTableDeed() { LootType = LootType.Blessed; } diff --git a/Scripts/Items/Special/Evil Home Decor Collection/BoneThrone.cs b/Scripts/Items/Special/Evil Home Decor Collection/BoneThrone.cs index c8c44c2ec..35001c4f9 100644 --- a/Scripts/Items/Special/Evil Home Decor Collection/BoneThrone.cs +++ b/Scripts/Items/Special/Evil Home Decor Collection/BoneThrone.cs @@ -5,7 +5,7 @@ namespace Server.Items [Flippable( 0x2A58, 0x2A59 )] public class BoneThroneComponent : AddonComponent { - public override int LabelNumber { get { return 1074476; } } // Bone throne + public override int LabelNumber => 1074476; // Bone throne public BoneThroneComponent() : base( 0x2A58 ) { @@ -42,10 +42,10 @@ namespace Server.Items public class BoneThroneAddon : BaseAddon { - public override BaseAddonDeed Deed { get { return new BoneThroneDeed(); } } + public override BaseAddonDeed Deed => new BoneThroneDeed(); [Constructible] - public BoneThroneAddon() : base() + public BoneThroneAddon() { AddComponent( new BoneThroneComponent(), 0, 0, 0 ); } @@ -71,11 +71,11 @@ namespace Server.Items public class BoneThroneDeed : BaseAddonDeed { - public override BaseAddon Addon { get { return new BoneThroneAddon(); } } - public override int LabelNumber { get { return 1074476; } } // Bone throne + public override BaseAddon Addon => new BoneThroneAddon(); + public override int LabelNumber => 1074476; // Bone throne [Constructible] - public BoneThroneDeed() : base() + public BoneThroneDeed() { LootType = LootType.Blessed; } diff --git a/Scripts/Items/Special/Evil Home Decor Collection/CreepyPortrait.cs b/Scripts/Items/Special/Evil Home Decor Collection/CreepyPortrait.cs index cf2280722..17bed00c7 100644 --- a/Scripts/Items/Special/Evil Home Decor Collection/CreepyPortrait.cs +++ b/Scripts/Items/Special/Evil Home Decor Collection/CreepyPortrait.cs @@ -7,7 +7,7 @@ namespace Server.Items [Flippable( 0x2A69, 0x2A6D )] public class CreepyPortraitComponent : AddonComponent { - public override int LabelNumber { get { return 1074481; } } // Creepy portrait + public override int LabelNumber => 1074481; // Creepy portrait public override bool HandlesOnMovement => true; public CreepyPortraitComponent() : base( 0x2A69 ) @@ -79,10 +79,10 @@ namespace Server.Items public class CreepyPortraitAddon : BaseAddon { - public override BaseAddonDeed Deed { get { return new CreepyPortraitDeed(); } } + public override BaseAddonDeed Deed => new CreepyPortraitDeed(); [Constructible] - public CreepyPortraitAddon() : base() + public CreepyPortraitAddon() { AddComponent( new CreepyPortraitComponent(), 0, 0, 0 ); } @@ -108,11 +108,11 @@ namespace Server.Items public class CreepyPortraitDeed : BaseAddonDeed { - public override BaseAddon Addon { get { return new CreepyPortraitAddon(); } } - public override int LabelNumber { get { return 1074481; } } // Creepy portrait + public override BaseAddon Addon => new CreepyPortraitAddon(); + public override int LabelNumber => 1074481; // Creepy portrait [Constructible] - public CreepyPortraitDeed() : base() + public CreepyPortraitDeed() { LootType = LootType.Blessed; } diff --git a/Scripts/Items/Special/Evil Home Decor Collection/DisturbingPortrait.cs b/Scripts/Items/Special/Evil Home Decor Collection/DisturbingPortrait.cs index bc0eedd9b..2062dd11a 100644 --- a/Scripts/Items/Special/Evil Home Decor Collection/DisturbingPortrait.cs +++ b/Scripts/Items/Special/Evil Home Decor Collection/DisturbingPortrait.cs @@ -7,7 +7,7 @@ namespace Server.Items [Flippable( 0x2A5D, 0x2A61 )] public class DisturbingPortraitComponent : AddonComponent { - public override int LabelNumber { get { return 1074479; } } // Disturbing portrait + public override int LabelNumber => 1074479; // Disturbing portrait private Timer m_Timer; @@ -63,10 +63,10 @@ namespace Server.Items public class DisturbingPortraitAddon : BaseAddon { - public override BaseAddonDeed Deed { get { return new DisturbingPortraitDeed(); } } + public override BaseAddonDeed Deed => new DisturbingPortraitDeed(); [Constructible] - public DisturbingPortraitAddon() : base() + public DisturbingPortraitAddon() { AddComponent( new DisturbingPortraitComponent(), 0, 0, 0 ); } @@ -92,11 +92,11 @@ namespace Server.Items public class DisturbingPortraitDeed : BaseAddonDeed { - public override BaseAddon Addon { get { return new DisturbingPortraitAddon(); } } - public override int LabelNumber { get { return 1074479; } } // Disturbing portrait + public override BaseAddon Addon => new DisturbingPortraitAddon(); + public override int LabelNumber => 1074479; // Disturbing portrait [Constructible] - public DisturbingPortraitDeed() : base() + public DisturbingPortraitDeed() { LootType = LootType.Blessed; } diff --git a/Scripts/Items/Special/Evil Home Decor Collection/HauntedMirror.cs b/Scripts/Items/Special/Evil Home Decor Collection/HauntedMirror.cs index 1129c53b5..fa3f21060 100644 --- a/Scripts/Items/Special/Evil Home Decor Collection/HauntedMirror.cs +++ b/Scripts/Items/Special/Evil Home Decor Collection/HauntedMirror.cs @@ -5,7 +5,7 @@ namespace Server.Items [Flippable( 0x2A7B, 0x2A7D )] public class HaunterMirrorComponent : AddonComponent { - public override int LabelNumber { get { return 1074800; } } // Haunted Mirror + public override int LabelNumber => 1074800; // Haunted Mirror public override bool HandlesOnMovement => true; public HaunterMirrorComponent() : base( 0x2A7B ) @@ -55,10 +55,10 @@ namespace Server.Items public class HaunterMirrorAddon : BaseAddon { - public override BaseAddonDeed Deed { get { return new HaunterMirrorDeed(); } } + public override BaseAddonDeed Deed => new HaunterMirrorDeed(); [Constructible] - public HaunterMirrorAddon() : base() + public HaunterMirrorAddon() { AddComponent( new HaunterMirrorComponent(), 0, 0, 0 ); } @@ -84,11 +84,11 @@ namespace Server.Items public class HaunterMirrorDeed : BaseAddonDeed { - public override BaseAddon Addon { get { return new HaunterMirrorAddon(); } } - public override int LabelNumber { get { return 1074800; } } // Haunted Mirror + public override BaseAddon Addon => new HaunterMirrorAddon(); + public override int LabelNumber => 1074800; // Haunted Mirror [Constructible] - public HaunterMirrorDeed() : base() + public HaunterMirrorDeed() { LootType = LootType.Blessed; } diff --git a/Scripts/Items/Special/Evil Home Decor Collection/MountedPixieBlue.cs b/Scripts/Items/Special/Evil Home Decor Collection/MountedPixieBlue.cs index 6f6bb72db..b84bbf2a2 100644 --- a/Scripts/Items/Special/Evil Home Decor Collection/MountedPixieBlue.cs +++ b/Scripts/Items/Special/Evil Home Decor Collection/MountedPixieBlue.cs @@ -7,7 +7,7 @@ namespace Server.Items [Flippable( 0x2A75, 0x2A76 )] public class MountedPixieBlueComponent : AddonComponent { - public override int LabelNumber { get { return 1074482; } } // Mounted pixie + public override int LabelNumber => 1074482; // Mounted pixie public MountedPixieBlueComponent() : base( 0x2A75 ) { @@ -42,9 +42,9 @@ namespace Server.Items public class MountedPixieBlueAddon : BaseAddon { - public override BaseAddonDeed Deed { get { return new MountedPixieBlueDeed(); } } + public override BaseAddonDeed Deed => new MountedPixieBlueDeed(); - public MountedPixieBlueAddon() : base() + public MountedPixieBlueAddon() { AddComponent( new MountedPixieBlueComponent(), 0, 0, 0 ); } @@ -70,11 +70,11 @@ namespace Server.Items public class MountedPixieBlueDeed : BaseAddonDeed { - public override BaseAddon Addon { get { return new MountedPixieBlueAddon(); } } - public override int LabelNumber { get { return 1074482; } } // Mounted pixie + public override BaseAddon Addon => new MountedPixieBlueAddon(); + public override int LabelNumber => 1074482; // Mounted pixie [Constructible] - public MountedPixieBlueDeed() : base() + public MountedPixieBlueDeed() { LootType = LootType.Blessed; } diff --git a/Scripts/Items/Special/Evil Home Decor Collection/MountedPixieGreen.cs b/Scripts/Items/Special/Evil Home Decor Collection/MountedPixieGreen.cs index 6c4f8272d..6f2a8b1ef 100644 --- a/Scripts/Items/Special/Evil Home Decor Collection/MountedPixieGreen.cs +++ b/Scripts/Items/Special/Evil Home Decor Collection/MountedPixieGreen.cs @@ -7,7 +7,7 @@ namespace Server.Items [Flippable( 0x2A71, 0x2A72 )] public class MountedPixieGreenComponent : AddonComponent { - public override int LabelNumber { get { return 1074482; } } // Mounted pixie + public override int LabelNumber => 1074482; // Mounted pixie public MountedPixieGreenComponent() : base( 0x2A71 ) { @@ -42,9 +42,9 @@ namespace Server.Items public class MountedPixieGreenAddon : BaseAddon { - public override BaseAddonDeed Deed { get { return new MountedPixieGreenDeed(); } } + public override BaseAddonDeed Deed => new MountedPixieGreenDeed(); - public MountedPixieGreenAddon() : base() + public MountedPixieGreenAddon() { AddComponent( new MountedPixieGreenComponent(), 0, 0, 0 ); } @@ -70,11 +70,11 @@ namespace Server.Items public class MountedPixieGreenDeed : BaseAddonDeed { - public override BaseAddon Addon { get { return new MountedPixieGreenAddon(); } } - public override int LabelNumber { get { return 1074482; } } // Mounted pixie + public override BaseAddon Addon => new MountedPixieGreenAddon(); + public override int LabelNumber => 1074482; // Mounted pixie [Constructible] - public MountedPixieGreenDeed() : base() + public MountedPixieGreenDeed() { LootType = LootType.Blessed; } diff --git a/Scripts/Items/Special/Evil Home Decor Collection/MountedPixieLime.cs b/Scripts/Items/Special/Evil Home Decor Collection/MountedPixieLime.cs index 9682b4c29..4cdbe8935 100644 --- a/Scripts/Items/Special/Evil Home Decor Collection/MountedPixieLime.cs +++ b/Scripts/Items/Special/Evil Home Decor Collection/MountedPixieLime.cs @@ -7,7 +7,7 @@ namespace Server.Items [Flippable( 0x2A77, 0x2A78 )] public class MountedPixieLimeComponent : AddonComponent { - public override int LabelNumber { get { return 1074482; } } // Mounted pixie + public override int LabelNumber => 1074482; // Mounted pixie public MountedPixieLimeComponent() : base( 0x2A77 ) { @@ -42,9 +42,9 @@ namespace Server.Items public class MountedPixieLimeAddon : BaseAddon { - public override BaseAddonDeed Deed { get { return new MountedPixieLimeDeed(); } } + public override BaseAddonDeed Deed => new MountedPixieLimeDeed(); - public MountedPixieLimeAddon() : base() + public MountedPixieLimeAddon() { AddComponent( new MountedPixieLimeComponent(), 0, 0, 0 ); } @@ -70,11 +70,11 @@ namespace Server.Items public class MountedPixieLimeDeed : BaseAddonDeed { - public override BaseAddon Addon { get { return new MountedPixieLimeAddon(); } } - public override int LabelNumber { get { return 1074482; } } // Mounted pixie + public override BaseAddon Addon => new MountedPixieLimeAddon(); + public override int LabelNumber => 1074482; // Mounted pixie [Constructible] - public MountedPixieLimeDeed() : base() + public MountedPixieLimeDeed() { LootType = LootType.Blessed; } diff --git a/Scripts/Items/Special/Evil Home Decor Collection/MountedPixieOrange.cs b/Scripts/Items/Special/Evil Home Decor Collection/MountedPixieOrange.cs index 200391a5c..c1b401458 100644 --- a/Scripts/Items/Special/Evil Home Decor Collection/MountedPixieOrange.cs +++ b/Scripts/Items/Special/Evil Home Decor Collection/MountedPixieOrange.cs @@ -7,7 +7,7 @@ namespace Server.Items [Flippable( 0x2A73, 0x2A74 )] public class MountedPixieOrangeComponent : AddonComponent { - public override int LabelNumber { get { return 1074482; } } // Mounted pixie + public override int LabelNumber => 1074482; // Mounted pixie public MountedPixieOrangeComponent() : base( 0x2A73 ) { @@ -42,9 +42,9 @@ namespace Server.Items public class MountedPixieOrangeAddon : BaseAddon { - public override BaseAddonDeed Deed { get { return new MountedPixieOrangeDeed(); } } + public override BaseAddonDeed Deed => new MountedPixieOrangeDeed(); - public MountedPixieOrangeAddon() : base() + public MountedPixieOrangeAddon() { AddComponent( new MountedPixieOrangeComponent(), 0, 0, 0 ); } @@ -70,11 +70,11 @@ namespace Server.Items public class MountedPixieOrangeDeed : BaseAddonDeed { - public override BaseAddon Addon { get { return new MountedPixieOrangeAddon(); } } - public override int LabelNumber { get { return 1074482; } } // Mounted pixie + public override BaseAddon Addon => new MountedPixieOrangeAddon(); + public override int LabelNumber => 1074482; // Mounted pixie [Constructible] - public MountedPixieOrangeDeed() : base() + public MountedPixieOrangeDeed() { LootType = LootType.Blessed; } diff --git a/Scripts/Items/Special/Evil Home Decor Collection/MountedPixieWhite.cs b/Scripts/Items/Special/Evil Home Decor Collection/MountedPixieWhite.cs index 5a651658e..1289a5712 100644 --- a/Scripts/Items/Special/Evil Home Decor Collection/MountedPixieWhite.cs +++ b/Scripts/Items/Special/Evil Home Decor Collection/MountedPixieWhite.cs @@ -7,7 +7,7 @@ namespace Server.Items [Flippable( 0x2A79, 0x2A7A )] public class MountedPixieWhiteComponent : AddonComponent { - public override int LabelNumber { get { return 1074482; } } // Mounted pixie + public override int LabelNumber => 1074482; // Mounted pixie public MountedPixieWhiteComponent() : base( 0x2A79 ) { @@ -42,9 +42,9 @@ namespace Server.Items public class MountedPixieWhiteAddon : BaseAddon { - public override BaseAddonDeed Deed { get { return new MountedPixieWhiteDeed(); } } + public override BaseAddonDeed Deed => new MountedPixieWhiteDeed(); - public MountedPixieWhiteAddon() : base() + public MountedPixieWhiteAddon() { AddComponent( new MountedPixieWhiteComponent(), 0, 0, 0 ); } @@ -70,11 +70,11 @@ namespace Server.Items public class MountedPixieWhiteDeed : BaseAddonDeed { - public override BaseAddon Addon { get { return new MountedPixieWhiteAddon(); } } - public override int LabelNumber { get { return 1074482; } } // Mounted pixie + public override BaseAddon Addon => new MountedPixieWhiteAddon(); + public override int LabelNumber => 1074482; // Mounted pixie [Constructible] - public MountedPixieWhiteDeed() : base() + public MountedPixieWhiteDeed() { LootType = LootType.Blessed; } diff --git a/Scripts/Items/Special/Evil Home Decor Collection/SacrificialAltar.cs b/Scripts/Items/Special/Evil Home Decor Collection/SacrificialAltar.cs index f7c8e5aec..53ca2b3ad 100644 --- a/Scripts/Items/Special/Evil Home Decor Collection/SacrificialAltar.cs +++ b/Scripts/Items/Special/Evil Home Decor Collection/SacrificialAltar.cs @@ -5,11 +5,11 @@ namespace Server.Items [FlippableAddon( Direction.South, Direction.East )] public class SacrificialAltarAddon : BaseAddonContainer { - public override BaseAddonContainerDeed Deed { get { return new SacrificialAltarDeed(); } } - public override int LabelNumber { get { return 1074818; } } // Sacrificial Altar - public override int DefaultMaxWeight { get { return 0; } } - public override int DefaultGumpID { get { return 0x107; } } - public override int DefaultDropSound { get { return 0x42; } } + public override BaseAddonContainerDeed Deed => new SacrificialAltarDeed(); + public override int LabelNumber => 1074818; // Sacrificial Altar + public override int DefaultMaxWeight => 0; + public override int DefaultGumpID => 0x107; + public override int DefaultDropSound => 0x42; private Timer m_Timer; @@ -134,11 +134,11 @@ namespace Server.Items public class SacrificialAltarDeed : BaseAddonContainerDeed { - public override BaseAddonContainer Addon { get { return new SacrificialAltarAddon(); } } - public override int LabelNumber { get { return 1074818; } } // Sacrificial Altar + public override BaseAddonContainer Addon => new SacrificialAltarAddon(); + public override int LabelNumber => 1074818; // Sacrificial Altar [Constructible] - public SacrificialAltarDeed() : base() + public SacrificialAltarDeed() { LootType = LootType.Blessed; } diff --git a/Scripts/Items/Special/Evil Home Decor Collection/UnsettlingPortrait.cs b/Scripts/Items/Special/Evil Home Decor Collection/UnsettlingPortrait.cs index 830eeecae..7bfd148ba 100644 --- a/Scripts/Items/Special/Evil Home Decor Collection/UnsettlingPortrait.cs +++ b/Scripts/Items/Special/Evil Home Decor Collection/UnsettlingPortrait.cs @@ -7,7 +7,7 @@ namespace Server.Items [Flippable( 0x2A65, 0x2A67 )] public class UnsettlingPortraitComponent : AddonComponent { - public override int LabelNumber { get { return 1074480; } } // Unsettling portrait + public override int LabelNumber => 1074480; // Unsettling portrait private Timer m_Timer; @@ -67,10 +67,10 @@ namespace Server.Items public class UnsettlingPortraitAddon : BaseAddon { - public override BaseAddonDeed Deed { get { return new UnsettlingPortraitDeed(); } } + public override BaseAddonDeed Deed => new UnsettlingPortraitDeed(); [Constructible] - public UnsettlingPortraitAddon() : base() + public UnsettlingPortraitAddon() { AddComponent( new UnsettlingPortraitComponent(), 0, 0, 0 ); } @@ -96,11 +96,11 @@ namespace Server.Items public class UnsettlingPortraitDeed : BaseAddonDeed { - public override BaseAddon Addon { get { return new UnsettlingPortraitAddon(); } } - public override int LabelNumber { get { return 1074480; } } // Unsettling portrait + public override BaseAddon Addon => new UnsettlingPortraitAddon(); + public override int LabelNumber => 1074480; // Unsettling portrait [Constructible] - public UnsettlingPortraitDeed() : base() + public UnsettlingPortraitDeed() { LootType = LootType.Blessed; } diff --git a/Scripts/Items/Special/Gifts/HearthOfHomeFire.cs b/Scripts/Items/Special/Gifts/HearthOfHomeFire.cs index bc7da5403..b98f13405 100644 --- a/Scripts/Items/Special/Gifts/HearthOfHomeFire.cs +++ b/Scripts/Items/Special/Gifts/HearthOfHomeFire.cs @@ -7,7 +7,7 @@ namespace Server.Items { public class HearthOfHomeFire : BaseAddon { - public override BaseAddonDeed Deed{ get{ return new HearthOfHomeFireDeed(); } } + public override BaseAddonDeed Deed => new HearthOfHomeFireDeed(); [Constructible] public HearthOfHomeFire( bool east ) @@ -54,9 +54,9 @@ namespace Server.Items { private bool m_East; - public override BaseAddon Addon{ get{ return new HearthOfHomeFire( m_East ); } } + public override BaseAddon Addon => new HearthOfHomeFire( m_East ); - public override int LabelNumber{ get{ return 1062919; } } // Hearth of the Home Fire + public override int LabelNumber => 1062919; // Hearth of the Home Fire [Constructible] public HearthOfHomeFireDeed() @@ -129,4 +129,4 @@ namespace Server.Items int version = reader.ReadEncodedInt(); } } -} \ No newline at end of file +} diff --git a/Scripts/Items/Special/Gifts/HolySword.cs b/Scripts/Items/Special/Gifts/HolySword.cs index 7317ef361..06f87b38c 100644 --- a/Scripts/Items/Special/Gifts/HolySword.cs +++ b/Scripts/Items/Special/Gifts/HolySword.cs @@ -5,10 +5,10 @@ namespace Server.Items { public class HolySword : Longsword { - public override int LabelNumber{ get{ return 1062921; } } // The Holy Sword + public override int LabelNumber => 1062921; // The Holy Sword - public override int InitMinHits{ get{ return 255; } } - public override int InitMaxHits{ get{ return 255; } } + public override int InitMinHits => 255; + public override int InitMaxHits => 255; [Constructible] public HolySword() @@ -42,4 +42,4 @@ namespace Server.Items int version = reader.ReadEncodedInt(); } } -} \ No newline at end of file +} diff --git a/Scripts/Items/Special/Gifts/LeggingsOfEmbers.cs b/Scripts/Items/Special/Gifts/LeggingsOfEmbers.cs index 60c2c0ec5..efe10c5e2 100644 --- a/Scripts/Items/Special/Gifts/LeggingsOfEmbers.cs +++ b/Scripts/Items/Special/Gifts/LeggingsOfEmbers.cs @@ -5,16 +5,16 @@ namespace Server.Items { public class LeggingsOfEmbers : PlateLegs { - public override int LabelNumber{ get{ return 1062911; } } // Royal Leggings of Embers + public override int LabelNumber => 1062911; // Royal Leggings of Embers - public override int BasePhysicalResistance{ get{ return 15; } } - public override int BaseFireResistance{ get{ return 25; } } - public override int BaseColdResistance{ get{ return 0; } } - public override int BasePoisonResistance{ get{ return 15; } } - public override int BaseEnergyResistance{ get{ return 15; } } + public override int BasePhysicalResistance => 15; + public override int BaseFireResistance => 25; + public override int BaseColdResistance => 0; + public override int BasePoisonResistance => 15; + public override int BaseEnergyResistance => 15; - public override int InitMinHits{ get{ return 255; } } - public override int InitMaxHits{ get{ return 255; } } + public override int InitMinHits => 255; + public override int InitMaxHits => 255; [Constructible] public LeggingsOfEmbers() @@ -45,4 +45,4 @@ namespace Server.Items int version = reader.ReadEncodedInt(); } } -} \ No newline at end of file +} diff --git a/Scripts/Items/Special/Gifts/RoseOfTrinsic.cs b/Scripts/Items/Special/Gifts/RoseOfTrinsic.cs index 7074c4232..462bb41de 100644 --- a/Scripts/Items/Special/Gifts/RoseOfTrinsic.cs +++ b/Scripts/Items/Special/Gifts/RoseOfTrinsic.cs @@ -20,7 +20,7 @@ namespace Server.Items private SecureLevel m_Level; - public override int LabelNumber{ get{ return 1062913; } } // Rose of Trinsic + public override int LabelNumber => 1062913; // Rose of Trinsic [CommandProperty( AccessLevel.GameMaster )] public SecureLevel Level @@ -164,7 +164,7 @@ namespace Server.Items public class RoseOfTrinsicPetal : Item { - public override int LabelNumber{ get{ return 1062926; } } // Petal of the Rose of Trinsic + public override int LabelNumber => 1062926; // Petal of the Rose of Trinsic [Constructible] public RoseOfTrinsicPetal() : this( 1 ) @@ -181,7 +181,7 @@ namespace Server.Items Hue = 0xE; } - + public override void OnDoubleClick( Mobile from ) { @@ -220,4 +220,4 @@ namespace Server.Items int version = reader.ReadEncodedInt(); } } -} \ No newline at end of file +} diff --git a/Scripts/Items/Special/Gifts/SamuraiHelm.cs b/Scripts/Items/Special/Gifts/SamuraiHelm.cs index 1c8109c8b..4ee2234db 100644 --- a/Scripts/Items/Special/Gifts/SamuraiHelm.cs +++ b/Scripts/Items/Special/Gifts/SamuraiHelm.cs @@ -6,18 +6,18 @@ namespace Server.Items [FlippableAttribute( 0x236C, 0x236D )] public class SamuraiHelm : BaseArmor { - public override int LabelNumber{ get{ return 1062923; } } // Ancient Samurai Helm + public override int LabelNumber => 1062923; // Ancient Samurai Helm - public override int BasePhysicalResistance{ get{ return 15; } } - public override int BaseFireResistance{ get{ return 10; } } - public override int BaseColdResistance{ get{ return 10; } } - public override int BasePoisonResistance{ get{ return 15; } } - public override int BaseEnergyResistance{ get{ return 10; } } + public override int BasePhysicalResistance => 15; + public override int BaseFireResistance => 10; + public override int BaseColdResistance => 10; + public override int BasePoisonResistance => 15; + public override int BaseEnergyResistance => 10; - public override int InitMinHits{ get{ return 255; } } - public override int InitMaxHits{ get{ return 255; } } + public override int InitMinHits => 255; + public override int InitMaxHits => 255; - public override ArmorMaterialType MaterialType{ get{ return ArmorMaterialType.Plate; } } + public override ArmorMaterialType MaterialType => ArmorMaterialType.Plate; [Constructible] public SamuraiHelm() : base( 0x236C ) @@ -49,4 +49,4 @@ namespace Server.Items int version = reader.ReadEncodedInt(); } } -} \ No newline at end of file +} diff --git a/Scripts/Items/Special/Gifts/ShaminoCrossbow.cs b/Scripts/Items/Special/Gifts/ShaminoCrossbow.cs index 2098c0e7f..743d715a8 100644 --- a/Scripts/Items/Special/Gifts/ShaminoCrossbow.cs +++ b/Scripts/Items/Special/Gifts/ShaminoCrossbow.cs @@ -5,10 +5,10 @@ namespace Server.Items { public class ShaminoCrossbow : RepeatingCrossbow { - public override int LabelNumber{ get{ return 1062915; } } // Shamino’s Best Crossbow + public override int LabelNumber => 1062915; // Shamino�s Best Crossbow - public override int InitMinHits{ get{ return 255; } } - public override int InitMaxHits{ get{ return 255; } } + public override int InitMinHits => 255; + public override int InitMaxHits => 255; [Constructible] public ShaminoCrossbow() @@ -40,4 +40,4 @@ namespace Server.Items int version = reader.ReadEncodedInt(); } } -} \ No newline at end of file +} diff --git a/Scripts/Items/Special/Gifts/TapestryOfSosaria.cs b/Scripts/Items/Special/Gifts/TapestryOfSosaria.cs index de4028e94..b7c4ac826 100644 --- a/Scripts/Items/Special/Gifts/TapestryOfSosaria.cs +++ b/Scripts/Items/Special/Gifts/TapestryOfSosaria.cs @@ -14,7 +14,7 @@ namespace Server.Items { private SecureLevel m_Level; - public override int LabelNumber{ get{ return 1062917; } } // The Tapestry of Sosaria + public override int LabelNumber => 1062917; // The Tapestry of Sosaria [CommandProperty( AccessLevel.GameMaster )] public SecureLevel Level @@ -80,4 +80,4 @@ namespace Server.Items m_Level = (SecureLevel) reader.ReadEncodedInt(); } } -} \ No newline at end of file +} diff --git a/Scripts/Items/Special/Heritage Items/AppleTrunk.cs b/Scripts/Items/Special/Heritage Items/AppleTrunk.cs index 2c0d38cac..bb7309bd2 100644 --- a/Scripts/Items/Special/Heritage Items/AppleTrunk.cs +++ b/Scripts/Items/Special/Heritage Items/AppleTrunk.cs @@ -4,10 +4,10 @@ namespace Server.Items { public class AppleTrunkAddon : BaseAddon { - public override BaseAddonDeed Deed { get { return new AppleTrunkDeed(); } } - + public override BaseAddonDeed Deed => new AppleTrunkDeed(); + [Constructible] - public AppleTrunkAddon() : base() + public AppleTrunkAddon() { AddComponent( new LocalizedAddonComponent( 0xD98, 1076785 ), 0, 0, 0 ); } @@ -33,11 +33,11 @@ namespace Server.Items public class AppleTrunkDeed : BaseAddonDeed { - public override BaseAddon Addon { get { return new AppleTrunkAddon(); } } - public override int LabelNumber { get { return 1076785; } } // Apple Trunk + public override BaseAddon Addon => new AppleTrunkAddon(); + public override int LabelNumber => 1076785; // Apple Trunk [Constructible] - public AppleTrunkDeed() : base() + public AppleTrunkDeed() { LootType = LootType.Blessed; } diff --git a/Scripts/Items/Special/Heritage Items/BlueDecorativeRug.cs b/Scripts/Items/Special/Heritage Items/BlueDecorativeRug.cs index af5220880..e4d03c1f5 100644 --- a/Scripts/Items/Special/Heritage Items/BlueDecorativeRug.cs +++ b/Scripts/Items/Special/Heritage Items/BlueDecorativeRug.cs @@ -4,10 +4,10 @@ namespace Server.Items { public class BlueDecorativeRugAddon : BaseAddon { - public override BaseAddonDeed Deed { get { return new BlueDecorativeRugDeed(); } } - + public override BaseAddonDeed Deed => new BlueDecorativeRugDeed(); + [Constructible] - public BlueDecorativeRugAddon() : base() + public BlueDecorativeRugAddon() { AddComponent( new LocalizedAddonComponent( 0xAD2, 1076589 ), 1, 1, 0 ); AddComponent( new LocalizedAddonComponent( 0xAD3, 1076589 ), -1, -1, 0 ); @@ -41,11 +41,11 @@ namespace Server.Items public class BlueDecorativeRugDeed : BaseAddonDeed { - public override BaseAddon Addon { get { return new BlueDecorativeRugAddon(); } } - public override int LabelNumber { get { return 1076589; } } // Blue decorative rug + public override BaseAddon Addon => new BlueDecorativeRugAddon(); + public override int LabelNumber => 1076589; // Blue decorative rug [Constructible] - public BlueDecorativeRugDeed() : base() + public BlueDecorativeRugDeed() { LootType = LootType.Blessed; } diff --git a/Scripts/Items/Special/Heritage Items/BlueFancyRug.cs b/Scripts/Items/Special/Heritage Items/BlueFancyRug.cs index f2097bf15..7643c5eb1 100644 --- a/Scripts/Items/Special/Heritage Items/BlueFancyRug.cs +++ b/Scripts/Items/Special/Heritage Items/BlueFancyRug.cs @@ -4,10 +4,10 @@ namespace Server.Items { public class BlueFancyRugAddon : BaseAddon { - public override BaseAddonDeed Deed { get { return new BlueFancyRugDeed(); } } + public override BaseAddonDeed Deed => new BlueFancyRugDeed(); [Constructible] - public BlueFancyRugAddon() : base() + public BlueFancyRugAddon() { AddComponent( new LocalizedAddonComponent( 0xAC2, 1076273 ), 1, 1, 0 ); AddComponent( new LocalizedAddonComponent( 0xAC3, 1076273 ), -1, -1, 0 ); @@ -41,11 +41,11 @@ namespace Server.Items public class BlueFancyRugDeed : BaseAddonDeed { - public override BaseAddon Addon { get { return new BlueFancyRugAddon(); } } - public override int LabelNumber { get { return 1076273; } } // Blue fancy rug + public override BaseAddon Addon => new BlueFancyRugAddon(); + public override int LabelNumber => 1076273; // Blue fancy rug [Constructible] - public BlueFancyRugDeed() : base() + public BlueFancyRugDeed() { LootType = LootType.Blessed; } diff --git a/Scripts/Items/Special/Heritage Items/BluePlainRug.cs b/Scripts/Items/Special/Heritage Items/BluePlainRug.cs index 02181a9c9..fc53fffea 100644 --- a/Scripts/Items/Special/Heritage Items/BluePlainRug.cs +++ b/Scripts/Items/Special/Heritage Items/BluePlainRug.cs @@ -4,10 +4,10 @@ namespace Server.Items { public class BluePlainRugAddon : BaseAddon { - public override BaseAddonDeed Deed { get { return new BluePlainRugDeed(); } } + public override BaseAddonDeed Deed => new BluePlainRugDeed(); [Constructible] - public BluePlainRugAddon() : base() + public BluePlainRugAddon() { AddComponent( new LocalizedAddonComponent( 0xAC2, 1076585 ), 1, 1, 0 ); AddComponent( new LocalizedAddonComponent( 0xAC3, 1076585 ), -1, -1, 0 ); @@ -41,11 +41,11 @@ namespace Server.Items public class BluePlainRugDeed : BaseAddonDeed { - public override BaseAddon Addon { get { return new BluePlainRugAddon(); } } - public override int LabelNumber { get { return 1076585; } } // Blue plain rug + public override BaseAddon Addon => new BluePlainRugAddon(); + public override int LabelNumber => 1076585; // Blue plain rug [Constructible] - public BluePlainRugDeed() : base() + public BluePlainRugDeed() { LootType = LootType.Blessed; } diff --git a/Scripts/Items/Special/Heritage Items/BoilingCauldron.cs b/Scripts/Items/Special/Heritage Items/BoilingCauldron.cs index 1ea06c420..73afda48c 100644 --- a/Scripts/Items/Special/Heritage Items/BoilingCauldron.cs +++ b/Scripts/Items/Special/Heritage Items/BoilingCauldron.cs @@ -5,10 +5,10 @@ namespace Server.Items [Flippable( 0x2068, 0x207A )] public class BoilingCauldronAddon : BaseAddonContainer { - public override BaseAddonContainerDeed Deed { get { return new BoilingCauldronDeed(); } } - public override int LabelNumber { get { return 1076267; } } // Boiling Cauldron - public override int DefaultGumpID { get { return 0x9; } } - public override int DefaultDropSound { get { return 0x42; } } + public override BaseAddonContainerDeed Deed => new BoilingCauldronDeed(); + public override int LabelNumber => 1076267; // Boiling Cauldron + public override int DefaultGumpID => 0x9; + public override int DefaultDropSound => 0x42; [Constructible] public BoilingCauldronAddon() : base( 0x2068 ) @@ -38,11 +38,11 @@ namespace Server.Items public class BoilingCauldronDeed : BaseAddonContainerDeed { - public override BaseAddonContainer Addon { get { return new BoilingCauldronAddon(); } } - public override int LabelNumber { get { return 1076267; } } // Boiling Cauldron + public override BaseAddonContainer Addon => new BoilingCauldronAddon(); + public override int LabelNumber => 1076267; // Boiling Cauldron [Constructible] - public BoilingCauldronDeed() : base() + public BoilingCauldronDeed() { LootType = LootType.Blessed; } diff --git a/Scripts/Items/Special/Heritage Items/CherryBlossomTree.cs b/Scripts/Items/Special/Heritage Items/CherryBlossomTree.cs index 3dde7a62b..935656738 100644 --- a/Scripts/Items/Special/Heritage Items/CherryBlossomTree.cs +++ b/Scripts/Items/Special/Heritage Items/CherryBlossomTree.cs @@ -4,10 +4,10 @@ namespace Server.Items { public class CherryBlossomTreeAddon : BaseAddon { - public override BaseAddonDeed Deed { get { return new CherryBlossomTreeDeed(); } } + public override BaseAddonDeed Deed => new CherryBlossomTreeDeed(); [Constructible] - public CherryBlossomTreeAddon() : base() + public CherryBlossomTreeAddon() { AddComponent( new LocalizedAddonComponent( 0x26EE, 1076268 ), 0, 0, 0 ); AddComponent( new LocalizedAddonComponent( 0x3122, 1076268 ), 0, 0, 0 ); @@ -34,11 +34,11 @@ namespace Server.Items public class CherryBlossomTreeDeed : BaseAddonDeed { - public override BaseAddon Addon { get { return new CherryBlossomTreeAddon(); } } - public override int LabelNumber { get { return 1076268; } } // Cherry Blossom Tree + public override BaseAddon Addon => new CherryBlossomTreeAddon(); + public override int LabelNumber => 1076268; // Cherry Blossom Tree [Constructible] - public CherryBlossomTreeDeed() : base() + public CherryBlossomTreeDeed() { LootType = LootType.Blessed; } diff --git a/Scripts/Items/Special/Heritage Items/CherryBlossomTrunk.cs b/Scripts/Items/Special/Heritage Items/CherryBlossomTrunk.cs index 962c68ba7..f4da14083 100644 --- a/Scripts/Items/Special/Heritage Items/CherryBlossomTrunk.cs +++ b/Scripts/Items/Special/Heritage Items/CherryBlossomTrunk.cs @@ -4,10 +4,10 @@ namespace Server.Items { public class CherryBlossomTrunkAddon : BaseAddon { - public override BaseAddonDeed Deed { get { return new CherryBlossomTrunkDeed(); } } + public override BaseAddonDeed Deed => new CherryBlossomTrunkDeed(); [Constructible] - public CherryBlossomTrunkAddon() : base() + public CherryBlossomTrunkAddon() { AddComponent( new LocalizedAddonComponent( 0x26EE, 1076784 ), 0, 0, 0 ); } @@ -33,11 +33,11 @@ namespace Server.Items public class CherryBlossomTrunkDeed : BaseAddonDeed { - public override BaseAddon Addon { get { return new CherryBlossomTrunkAddon(); } } - public override int LabelNumber { get { return 1076784; } } // Cherry Blossom Trunk + public override BaseAddon Addon => new CherryBlossomTrunkAddon(); + public override int LabelNumber => 1076784; // Cherry Blossom Trunk [Constructible] - public CherryBlossomTrunkDeed() : base() + public CherryBlossomTrunkDeed() { LootType = LootType.Blessed; } diff --git a/Scripts/Items/Special/Heritage Items/CinnamonFancyRug.cs b/Scripts/Items/Special/Heritage Items/CinnamonFancyRug.cs index 6ed8196a5..fc647103b 100644 --- a/Scripts/Items/Special/Heritage Items/CinnamonFancyRug.cs +++ b/Scripts/Items/Special/Heritage Items/CinnamonFancyRug.cs @@ -4,10 +4,10 @@ namespace Server.Items { public class CinnamonFancyRugAddon : BaseAddon { - public override BaseAddonDeed Deed { get { return new CinnamonFancyRugDeed(); } } + public override BaseAddonDeed Deed => new CinnamonFancyRugDeed(); [Constructible] - public CinnamonFancyRugAddon() : base() + public CinnamonFancyRugAddon() { AddComponent( new LocalizedAddonComponent( 0xAE3, 1076587 ), 1, 1, 0 ); AddComponent( new LocalizedAddonComponent( 0xAE4, 1076587 ), -1, -1, 0 ); @@ -41,11 +41,11 @@ namespace Server.Items public class CinnamonFancyRugDeed : BaseAddonDeed { - public override BaseAddon Addon { get { return new CinnamonFancyRugAddon(); } } - public override int LabelNumber { get { return 1076587; } } // Cinnamon fancy rug + public override BaseAddon Addon => new CinnamonFancyRugAddon(); + public override int LabelNumber => 1076587; // Cinnamon fancy rug [Constructible] - public CinnamonFancyRugDeed() : base() + public CinnamonFancyRugDeed() { LootType = LootType.Blessed; } diff --git a/Scripts/Items/Special/Heritage Items/Curtains.cs b/Scripts/Items/Special/Heritage Items/Curtains.cs index 9ed907d2f..34f1654b5 100644 --- a/Scripts/Items/Special/Heritage Items/Curtains.cs +++ b/Scripts/Items/Special/Heritage Items/Curtains.cs @@ -7,7 +7,7 @@ namespace Server.Items { public class CurtainsComponent : AddonComponent, IDyable { - public override int LabelNumber { get { return 1076280; } } // Curtains + public override int LabelNumber => 1076280; // Curtains public override bool DisplayWeight => false; private int m_ClosedID; @@ -85,11 +85,11 @@ namespace Server.Items public class CurtainsAddon : BaseAddon { - public override BaseAddonDeed Deed { get { return new CurtainsDeed(); } } + public override BaseAddonDeed Deed => new CurtainsDeed(); public override bool RetainDeedHue => true; [Constructible] - public CurtainsAddon( bool east ) : base() + public CurtainsAddon( bool east ) { if ( east ) // east { @@ -128,13 +128,13 @@ namespace Server.Items public class CurtainsDeed : BaseAddonDeed { - public override BaseAddon Addon { get { return new CurtainsAddon( m_East ); } } - public override int LabelNumber { get { return 1076280; } } // Curtains + public override BaseAddon Addon => new CurtainsAddon( m_East ); + public override int LabelNumber => 1076280; // Curtains private bool m_East; [Constructible] - public CurtainsDeed() : base() + public CurtainsDeed() { LootType = LootType.Blessed; } diff --git a/Scripts/Items/Special/Heritage Items/Fountain.cs b/Scripts/Items/Special/Heritage Items/Fountain.cs index 1ad00338e..256344ee9 100644 --- a/Scripts/Items/Special/Heritage Items/Fountain.cs +++ b/Scripts/Items/Special/Heritage Items/Fountain.cs @@ -4,10 +4,10 @@ namespace Server.Items { public class FountainAddon : StoneFountainAddon { - public override BaseAddonDeed Deed { get { return new FountainDeed(); } } + public override BaseAddonDeed Deed => new FountainDeed(); [Constructible] - public FountainAddon() : base() + public FountainAddon() { } @@ -32,11 +32,11 @@ namespace Server.Items public class FountainDeed : BaseAddonDeed { - public override BaseAddon Addon { get { return new FountainAddon(); } } - public override int LabelNumber { get { return 1076283; } } // Fountain + public override BaseAddon Addon => new FountainAddon(); + public override int LabelNumber => 1076283; // Fountain [Constructible] - public FountainDeed() : base() + public FountainDeed() { LootType = LootType.Blessed; } diff --git a/Scripts/Items/Special/Heritage Items/FruitTrees.cs b/Scripts/Items/Special/Heritage Items/FruitTrees.cs index 3614d7ab8..e0c435c5e 100644 --- a/Scripts/Items/Special/Heritage Items/FruitTrees.cs +++ b/Scripts/Items/Special/Heritage Items/FruitTrees.cs @@ -24,7 +24,7 @@ namespace Server.Items } } - public BaseFruitTreeAddon() : base() + public BaseFruitTreeAddon() { Timer.DelayCall( TimeSpan.FromMinutes( 5 ), new TimerCallback( Respawn ) ); } @@ -47,7 +47,7 @@ namespace Server.Items if ( !from.PlaceInBackpack( fruit ) ) { fruit.Delete(); - from.SendLocalizedMessage( 501015 ); // There is no room in your backpack for the fruit. + from.SendLocalizedMessage( 501015 ); // There is no room in your backpack for the fruit. } else { @@ -93,11 +93,11 @@ namespace Server.Items public class AppleTreeAddon : BaseFruitTreeAddon { - public override BaseAddonDeed Deed { get { return new AppleTreeDeed(); } } - public override Item Fruit { get { return new Apple(); } } + public override BaseAddonDeed Deed => new AppleTreeDeed(); + public override Item Fruit => new Apple(); [Constructible] - public AppleTreeAddon() : base() + public AppleTreeAddon() { AddComponent( new LocalizedAddonComponent( 0xD98, 1076269 ), 0, 0, 0 ); AddComponent( new LocalizedAddonComponent( 0x3124, 1076269 ), 0, 0, 0 ); @@ -124,11 +124,11 @@ namespace Server.Items public class AppleTreeDeed : BaseAddonDeed { - public override BaseAddon Addon { get { return new AppleTreeAddon(); } } - public override int LabelNumber { get { return 1076269; } } // Apple Tree + public override BaseAddon Addon => new AppleTreeAddon(); + public override int LabelNumber => 1076269; // Apple Tree [Constructible] - public AppleTreeDeed() : base() + public AppleTreeDeed() { LootType = LootType.Blessed; } @@ -154,11 +154,11 @@ namespace Server.Items public class PeachTreeAddon : BaseFruitTreeAddon { - public override BaseAddonDeed Deed { get { return new PeachTreeDeed(); } } - public override Item Fruit { get { return new Peach(); } } + public override BaseAddonDeed Deed => new PeachTreeDeed(); + public override Item Fruit => new Peach(); [Constructible] - public PeachTreeAddon() : base() + public PeachTreeAddon() { AddComponent( new LocalizedAddonComponent( 0xD9C, 1076270 ), 0, 0, 0 ); AddComponent( new LocalizedAddonComponent( 0x3123, 1076270 ), 0, 0, 0 ); @@ -185,11 +185,11 @@ namespace Server.Items public class PeachTreeDeed : BaseAddonDeed { - public override BaseAddon Addon { get { return new PeachTreeAddon(); } } - public override int LabelNumber { get { return 1076270; } } // Peach Tree + public override BaseAddon Addon => new PeachTreeAddon(); + public override int LabelNumber => 1076270; // Peach Tree [Constructible] - public PeachTreeDeed() : base() + public PeachTreeDeed() { LootType = LootType.Blessed; } diff --git a/Scripts/Items/Special/Heritage Items/GoldenDecorativeRug.cs b/Scripts/Items/Special/Heritage Items/GoldenDecorativeRug.cs index 4c95cb496..c64d53615 100644 --- a/Scripts/Items/Special/Heritage Items/GoldenDecorativeRug.cs +++ b/Scripts/Items/Special/Heritage Items/GoldenDecorativeRug.cs @@ -4,10 +4,10 @@ namespace Server.Items { public class GoldenDecorativeRugAddon : BaseAddon { - public override BaseAddonDeed Deed { get { return new GoldenDecorativeRugDeed(); } } + public override BaseAddonDeed Deed => new GoldenDecorativeRugDeed(); [Constructible] - public GoldenDecorativeRugAddon() : base() + public GoldenDecorativeRugAddon() { AddComponent( new LocalizedAddonComponent( 0xADB, 1076586 ), 1, 1, 0 ); AddComponent( new LocalizedAddonComponent( 0xADC, 1076586 ), -1, -1, 0 ); @@ -41,11 +41,11 @@ namespace Server.Items public class GoldenDecorativeRugDeed : BaseAddonDeed { - public override BaseAddon Addon { get { return new GoldenDecorativeRugAddon(); } } - public override int LabelNumber { get { return 1076586; } } // Golden decorative rug + public override BaseAddon Addon => new GoldenDecorativeRugAddon(); + public override int LabelNumber => 1076586; // Golden decorative rug [Constructible] - public GoldenDecorativeRugDeed() : base() + public GoldenDecorativeRugDeed() { LootType = LootType.Blessed; } diff --git a/Scripts/Items/Special/Heritage Items/Guillotine.cs b/Scripts/Items/Special/Heritage Items/Guillotine.cs index f5112924c..6c2b5bba9 100644 --- a/Scripts/Items/Special/Heritage Items/Guillotine.cs +++ b/Scripts/Items/Special/Heritage Items/Guillotine.cs @@ -8,7 +8,7 @@ namespace Server.Items [Flippable( 0x125E, 0x1230 )] public class GuillotineComponent : AddonComponent { - public override int LabelNumber { get { return 1024656; } } // Guillotine + public override int LabelNumber => 1024656; // Guillotine public GuillotineComponent() : base( 0x125E ) { @@ -35,10 +35,10 @@ namespace Server.Items public class GuillotineAddon : BaseAddon { - public override BaseAddonDeed Deed { get { return new GuillotineDeed(); } } + public override BaseAddonDeed Deed => new GuillotineDeed(); [Constructible] - public GuillotineAddon() : base() + public GuillotineAddon() { AddComponent( new GuillotineComponent(), 0, 0, 0 ); } @@ -145,11 +145,11 @@ namespace Server.Items public class GuillotineDeed : BaseAddonDeed { - public override BaseAddon Addon { get { return new GuillotineAddon(); } } - public override int LabelNumber { get { return 1024656; } } // Guillotine + public override BaseAddon Addon => new GuillotineAddon(); + public override int LabelNumber => 1024656; // Guillotine [Constructible] - public GuillotineDeed() : base() + public GuillotineDeed() { LootType = LootType.Blessed; } diff --git a/Scripts/Items/Special/Heritage Items/HangingAxes.cs b/Scripts/Items/Special/Heritage Items/HangingAxes.cs index aed2f0d3a..395d5bed0 100644 --- a/Scripts/Items/Special/Heritage Items/HangingAxes.cs +++ b/Scripts/Items/Special/Heritage Items/HangingAxes.cs @@ -7,10 +7,10 @@ namespace Server.Items { public class HangingAxesAddon : BaseAddon { - public override BaseAddonDeed Deed { get { return new HangingAxesDeed(); } } + public override BaseAddonDeed Deed => new HangingAxesDeed(); [Constructible] - public HangingAxesAddon( bool east ) : base() + public HangingAxesAddon( bool east ) { if ( east ) // east { @@ -45,13 +45,13 @@ namespace Server.Items public class HangingAxesDeed : BaseAddonDeed { - public override BaseAddon Addon { get { return new HangingAxesAddon( m_East ); } } - public override int LabelNumber { get { return 1076271; } } // Hanging Axes + public override BaseAddon Addon => new HangingAxesAddon( m_East ); + public override int LabelNumber => 1076271; // Hanging Axes private bool m_East; [Constructible] - public HangingAxesDeed() : base() + public HangingAxesDeed() { LootType = LootType.Blessed; } diff --git a/Scripts/Items/Special/Heritage Items/HangingSwords.cs b/Scripts/Items/Special/Heritage Items/HangingSwords.cs index afd8f5fe7..c7365da26 100644 --- a/Scripts/Items/Special/Heritage Items/HangingSwords.cs +++ b/Scripts/Items/Special/Heritage Items/HangingSwords.cs @@ -7,10 +7,10 @@ namespace Server.Items { public class HangingSwordsAddon : BaseAddon { - public override BaseAddonDeed Deed { get { return new HangingSwordsDeed(); } } + public override BaseAddonDeed Deed => new HangingSwordsDeed(); [Constructible] - public HangingSwordsAddon( bool east ) : base() + public HangingSwordsAddon( bool east ) { if ( east ) // east { @@ -45,13 +45,13 @@ namespace Server.Items public class HangingSwordsDeed : BaseAddonDeed { - public override BaseAddon Addon { get { return new HangingSwordsAddon( m_East ); } } - public override int LabelNumber { get { return 1076272; } } // Hanging Swords + public override BaseAddon Addon => new HangingSwordsAddon( m_East ); + public override int LabelNumber => 1076272; // Hanging Swords private bool m_East; [Constructible] - public HangingSwordsDeed() : base() + public HangingSwordsDeed() { LootType = LootType.Blessed; } diff --git a/Scripts/Items/Special/Heritage Items/HouseLadder.cs b/Scripts/Items/Special/Heritage Items/HouseLadder.cs index 2a5f4363a..4c038fffb 100644 --- a/Scripts/Items/Special/Heritage Items/HouseLadder.cs +++ b/Scripts/Items/Special/Heritage Items/HouseLadder.cs @@ -7,10 +7,10 @@ namespace Server.Items { public class HouseLadderAddon : BaseAddon { - public override BaseAddonDeed Deed { get { return new HouseLadderDeed(); } } + public override BaseAddonDeed Deed => new HouseLadderDeed(); [Constructible] - public HouseLadderAddon( int type ) : base() + public HouseLadderAddon( int type ) { switch ( type ) { @@ -70,13 +70,13 @@ namespace Server.Items public class HouseLadderDeed : BaseAddonDeed { - public override BaseAddon Addon { get { return new HouseLadderAddon( m_Type ); } } - public override int LabelNumber { get { return 1076287; } } // Ladder + public override BaseAddon Addon => new HouseLadderAddon( m_Type ); + public override int LabelNumber => 1076287; // Ladder private int m_Type; [Constructible] - public HouseLadderDeed() : base() + public HouseLadderDeed() { LootType = LootType.Blessed; } diff --git a/Scripts/Items/Special/Heritage Items/IronMaiden.cs b/Scripts/Items/Special/Heritage Items/IronMaiden.cs index e8bbd30ef..0504128da 100644 --- a/Scripts/Items/Special/Heritage Items/IronMaiden.cs +++ b/Scripts/Items/Special/Heritage Items/IronMaiden.cs @@ -7,9 +7,9 @@ namespace Server.Items { public class IronMaidenAddon : BaseAddon { - public override BaseAddonDeed Deed { get { return new IronMaidenDeed(); } } + public override BaseAddonDeed Deed => new IronMaidenDeed(); - public IronMaidenAddon() : base() + public IronMaidenAddon() { AddComponent( new LocalizedAddonComponent( 0x1249, 1076288 ), 0, 0, 0 ); } @@ -106,11 +106,11 @@ namespace Server.Items public class IronMaidenDeed : BaseAddonDeed { - public override BaseAddon Addon { get { return new IronMaidenAddon(); } } - public override int LabelNumber { get { return 1076288; } } // Iron Maiden + public override BaseAddon Addon => new IronMaidenAddon(); + public override int LabelNumber => 1076288; // Iron Maiden [Constructible] - public IronMaidenDeed() : base() + public IronMaidenDeed() { LootType = LootType.Blessed; } diff --git a/Scripts/Items/Special/Heritage Items/LargeFishingNet.cs b/Scripts/Items/Special/Heritage Items/LargeFishingNet.cs index 725d588a7..cbebff1bd 100644 --- a/Scripts/Items/Special/Heritage Items/LargeFishingNet.cs +++ b/Scripts/Items/Special/Heritage Items/LargeFishingNet.cs @@ -5,7 +5,7 @@ namespace Server.Items [Flippable( 0x3D8E, 0x3D8F )] public class LargeFishingNetComponent : AddonComponent { - public override int LabelNumber { get { return 1076285; } } // Large Fish Net + public override int LabelNumber => 1076285; // Large Fish Net public LargeFishingNetComponent() : base( 0x3D8E ) { @@ -32,10 +32,10 @@ namespace Server.Items public class LargeFishingNetAddon : BaseAddon { - public override BaseAddonDeed Deed { get { return new LargeFishingNetDeed(); } } + public override BaseAddonDeed Deed => new LargeFishingNetDeed(); [Constructible] - public LargeFishingNetAddon() : base() + public LargeFishingNetAddon() { AddComponent( new LargeFishingNetComponent(), 0, 0, 0 ); } @@ -61,11 +61,11 @@ namespace Server.Items public class LargeFishingNetDeed : BaseAddonDeed { - public override BaseAddon Addon { get { return new LargeFishingNetAddon(); } } - public override int LabelNumber { get { return 1076285; } } // Large Fish Net + public override BaseAddon Addon => new LargeFishingNetAddon(); + public override int LabelNumber => 1076285; // Large Fish Net [Constructible] - public LargeFishingNetDeed() : base() + public LargeFishingNetDeed() { LootType = LootType.Blessed; } diff --git a/Scripts/Items/Special/Heritage Items/PeachTrunk.cs b/Scripts/Items/Special/Heritage Items/PeachTrunk.cs index f056792bd..2d7398ede 100644 --- a/Scripts/Items/Special/Heritage Items/PeachTrunk.cs +++ b/Scripts/Items/Special/Heritage Items/PeachTrunk.cs @@ -4,10 +4,10 @@ namespace Server.Items { public class PeachTrunkAddon : BaseAddon { - public override BaseAddonDeed Deed { get { return new PeachTrunkDeed(); } } + public override BaseAddonDeed Deed => new PeachTrunkDeed(); [Constructible] - public PeachTrunkAddon() : base() + public PeachTrunkAddon() { AddComponent( new LocalizedAddonComponent( 0xD9C, 1076786 ), 0, 0, 0 ); } @@ -33,11 +33,11 @@ namespace Server.Items public class PeachTrunkDeed : BaseAddonDeed { - public override BaseAddon Addon { get { return new PeachTrunkAddon(); } } - public override int LabelNumber { get { return 1076786; } } // Peach Trunk + public override BaseAddon Addon => new PeachTrunkAddon(); + public override int LabelNumber => 1076786; // Peach Trunk [Constructible] - public PeachTrunkDeed() : base() + public PeachTrunkDeed() { LootType = LootType.Blessed; } diff --git a/Scripts/Items/Special/Heritage Items/PinkFancyRug.cs b/Scripts/Items/Special/Heritage Items/PinkFancyRug.cs index 902d4026c..3b3b56339 100644 --- a/Scripts/Items/Special/Heritage Items/PinkFancyRug.cs +++ b/Scripts/Items/Special/Heritage Items/PinkFancyRug.cs @@ -4,10 +4,10 @@ namespace Server.Items { public class PinkFancyRugAddon : BaseAddon { - public override BaseAddonDeed Deed { get { return new PinkFancyRugDeed(); } } + public override BaseAddonDeed Deed => new PinkFancyRugDeed(); [Constructible] - public PinkFancyRugAddon() : base() + public PinkFancyRugAddon() { AddComponent( new LocalizedAddonComponent( 0xAEE, 1076590 ), 1, 1, 0 ); AddComponent( new LocalizedAddonComponent( 0xAEF, 1076590 ), -1, -1, 0 ); @@ -41,11 +41,11 @@ namespace Server.Items public class PinkFancyRugDeed : BaseAddonDeed { - public override BaseAddon Addon { get { return new PinkFancyRugAddon(); } } - public override int LabelNumber { get { return 1076590; } } // Pink fancy rug + public override BaseAddon Addon => new PinkFancyRugAddon(); + public override int LabelNumber => 1076590; // Pink fancy rug [Constructible] - public PinkFancyRugDeed() : base() + public PinkFancyRugDeed() { LootType = LootType.Blessed; } diff --git a/Scripts/Items/Special/Heritage Items/RedPlainRug.cs b/Scripts/Items/Special/Heritage Items/RedPlainRug.cs index 015e04d38..b5691cf64 100644 --- a/Scripts/Items/Special/Heritage Items/RedPlainRug.cs +++ b/Scripts/Items/Special/Heritage Items/RedPlainRug.cs @@ -4,10 +4,10 @@ namespace Server.Items { public class RedPlainRugAddon : BaseAddon { - public override BaseAddonDeed Deed { get { return new RedPlainRugDeed(); } } + public override BaseAddonDeed Deed => new RedPlainRugDeed(); [Constructible] - public RedPlainRugAddon() : base() + public RedPlainRugAddon() { AddComponent( new LocalizedAddonComponent( 0xAC9, 1076588 ), 1, 1, 0 ); AddComponent( new LocalizedAddonComponent( 0xACA, 1076588 ), -1, -1, 0 ); @@ -41,11 +41,11 @@ namespace Server.Items public class RedPlainRugDeed : BaseAddonDeed { - public override BaseAddon Addon { get { return new RedPlainRugAddon(); } } - public override int LabelNumber { get { return 1076588; } } // Red plain rug + public override BaseAddon Addon => new RedPlainRugAddon(); + public override int LabelNumber => 1076588; // Red plain rug [Constructible] - public RedPlainRugDeed() : base() + public RedPlainRugDeed() { LootType = LootType.Blessed; } diff --git a/Scripts/Items/Special/Heritage Items/Scarecrow.cs b/Scripts/Items/Special/Heritage Items/Scarecrow.cs index f9ebdd8e8..043e1b6ab 100644 --- a/Scripts/Items/Special/Heritage Items/Scarecrow.cs +++ b/Scripts/Items/Special/Heritage Items/Scarecrow.cs @@ -5,7 +5,7 @@ namespace Server.Items [Flippable( 0x1E34, 0x1E35 )] public class ScarecrowComponent : AddonComponent { - public override int LabelNumber { get { return 1076608; } } // Scarecrow + public override int LabelNumber => 1076608; // Scarecrow public ScarecrowComponent() : base( 0x1E34 ) { @@ -32,10 +32,10 @@ namespace Server.Items public class ScarecrowAddon : BaseAddon { - public override BaseAddonDeed Deed { get { return new ScarecrowDeed(); } } + public override BaseAddonDeed Deed => new ScarecrowDeed(); [Constructible] - public ScarecrowAddon() : base() + public ScarecrowAddon() { AddComponent( new ScarecrowComponent(), 0, 0, 0 ); } @@ -61,11 +61,11 @@ namespace Server.Items public class ScarecrowDeed : BaseAddonDeed { - public override BaseAddon Addon { get { return new ScarecrowAddon(); } } - public override int LabelNumber { get { return 1076608; } } // Scarecrow + public override BaseAddon Addon => new ScarecrowAddon(); + public override int LabelNumber => 1076608; // Scarecrow [Constructible] - public ScarecrowDeed() : base() + public ScarecrowDeed() { LootType = LootType.Blessed; } diff --git a/Scripts/Items/Special/Heritage Items/SmallFishingNet.cs b/Scripts/Items/Special/Heritage Items/SmallFishingNet.cs index 4f179a489..76e58850c 100644 --- a/Scripts/Items/Special/Heritage Items/SmallFishingNet.cs +++ b/Scripts/Items/Special/Heritage Items/SmallFishingNet.cs @@ -5,7 +5,7 @@ namespace Server.Items [Flippable( 0x1EA3, 0x1EA4 )] public class SmallFishingNetComponent : AddonComponent { - public override int LabelNumber { get { return 1076286; } } // Small Fish Net + public override int LabelNumber => 1076286; // Small Fish Net public SmallFishingNetComponent() : base( 0x1EA3 ) { @@ -32,10 +32,10 @@ namespace Server.Items public class SmallFishingNetAddon : BaseAddon { - public override BaseAddonDeed Deed { get { return new SmallFishingNetDeed(); } } + public override BaseAddonDeed Deed => new SmallFishingNetDeed(); [Constructible] - public SmallFishingNetAddon() : base() + public SmallFishingNetAddon() { AddComponent( new SmallFishingNetComponent(), 0, 0, 0 ); } @@ -61,11 +61,11 @@ namespace Server.Items public class SmallFishingNetDeed : BaseAddonDeed { - public override BaseAddon Addon { get { return new SmallFishingNetAddon(); } } - public override int LabelNumber { get { return 1076286; } } // Small Fish Net + public override BaseAddon Addon => new SmallFishingNetAddon(); + public override int LabelNumber => 1076286; // Small Fish Net [Constructible] - public SmallFishingNetDeed() : base() + public SmallFishingNetDeed() { LootType = LootType.Blessed; } diff --git a/Scripts/Items/Special/Heritage Items/Statue.cs b/Scripts/Items/Special/Heritage Items/Statue.cs index eef4f868c..e8630a075 100644 --- a/Scripts/Items/Special/Heritage Items/Statue.cs +++ b/Scripts/Items/Special/Heritage Items/Statue.cs @@ -7,10 +7,10 @@ namespace Server.Items { public class StoneStatueAddon : BaseAddon { - public override BaseAddonDeed Deed { get { return new StoneStatueDeed(); } } + public override BaseAddonDeed Deed => new StoneStatueDeed(); [Constructible] - public StoneStatueAddon( bool east ) : base() + public StoneStatueAddon( bool east ) { if ( east ) // east { @@ -47,13 +47,13 @@ namespace Server.Items public class StoneStatueDeed : BaseAddonDeed { - public override BaseAddon Addon { get { return new StoneStatueAddon( m_East ); } } - public override int LabelNumber { get { return 1076284; } } // Statue + public override BaseAddon Addon => new StoneStatueAddon( m_East ); + public override int LabelNumber => 1076284; // Statue private bool m_East; [Constructible] - public StoneStatueDeed() : base() + public StoneStatueDeed() { LootType = LootType.Blessed; } diff --git a/Scripts/Items/Special/Heritage Items/SuitOfGoldArmor.cs b/Scripts/Items/Special/Heritage Items/SuitOfGoldArmor.cs index 12fda9888..22773cf20 100644 --- a/Scripts/Items/Special/Heritage Items/SuitOfGoldArmor.cs +++ b/Scripts/Items/Special/Heritage Items/SuitOfGoldArmor.cs @@ -5,7 +5,7 @@ namespace Server.Items [Flippable( 0x3DAA, 0x3DA9 )] public class SuitOfGoldArmorComponent : AddonComponent { - public override int LabelNumber { get { return 1076265; } } // Suit of Gold Armor + public override int LabelNumber => 1076265; // Suit of Gold Armor public SuitOfGoldArmorComponent() : base( 0x3DAA ) { @@ -32,10 +32,10 @@ namespace Server.Items public class SuitOfGoldArmorAddon : BaseAddon { - public override BaseAddonDeed Deed { get { return new SuitOfGoldArmorDeed(); } } + public override BaseAddonDeed Deed => new SuitOfGoldArmorDeed(); [Constructible] - public SuitOfGoldArmorAddon() : base() + public SuitOfGoldArmorAddon() { AddComponent( new SuitOfGoldArmorComponent(), 0, 0, 0 ); } @@ -61,11 +61,11 @@ namespace Server.Items public class SuitOfGoldArmorDeed : BaseAddonDeed { - public override BaseAddon Addon { get { return new SuitOfGoldArmorAddon(); } } - public override int LabelNumber { get { return 1076265; } } // Suit of Gold Armor + public override BaseAddon Addon => new SuitOfGoldArmorAddon(); + public override int LabelNumber => 1076265; // Suit of Gold Armor [Constructible] - public SuitOfGoldArmorDeed() : base() + public SuitOfGoldArmorDeed() { LootType = LootType.Blessed; } diff --git a/Scripts/Items/Special/Heritage Items/SuitOfSilverArmor.cs b/Scripts/Items/Special/Heritage Items/SuitOfSilverArmor.cs index 08333ada8..b7e067d8b 100644 --- a/Scripts/Items/Special/Heritage Items/SuitOfSilverArmor.cs +++ b/Scripts/Items/Special/Heritage Items/SuitOfSilverArmor.cs @@ -5,7 +5,7 @@ namespace Server.Items [Flippable( 0x3D86, 0x3D87 )] public class SuitOfSilverArmorComponent : AddonComponent { - public override int LabelNumber { get { return 1076266; } } // Suit of Silver Armor + public override int LabelNumber => 1076266; // Suit of Silver Armor public SuitOfSilverArmorComponent() : base( 0x3D86 ) { @@ -32,10 +32,10 @@ namespace Server.Items public class SuitOfSilverArmorAddon : BaseAddon { - public override BaseAddonDeed Deed { get { return new SuitOfSilverArmorDeed(); } } + public override BaseAddonDeed Deed => new SuitOfSilverArmorDeed(); [Constructible] - public SuitOfSilverArmorAddon() : base() + public SuitOfSilverArmorAddon() { AddComponent( new SuitOfSilverArmorComponent(), 0, 0, 0 ); } @@ -61,11 +61,11 @@ namespace Server.Items public class SuitOfSilverArmorDeed : BaseAddonDeed { - public override BaseAddon Addon { get { return new SuitOfSilverArmorAddon(); } } - public override int LabelNumber { get { return 1076266; } } // Suit of Silver Armor + public override BaseAddon Addon => new SuitOfSilverArmorAddon(); + public override int LabelNumber => 1076266; // Suit of Silver Armor [Constructible] - public SuitOfSilverArmorDeed() : base() + public SuitOfSilverArmorDeed() { LootType = LootType.Blessed; } diff --git a/Scripts/Items/Special/Heritage Items/TableWithBlueCloth.cs b/Scripts/Items/Special/Heritage Items/TableWithBlueCloth.cs index ac4da37c5..9f767af09 100644 --- a/Scripts/Items/Special/Heritage Items/TableWithBlueCloth.cs +++ b/Scripts/Items/Special/Heritage Items/TableWithBlueCloth.cs @@ -4,10 +4,10 @@ namespace Server.Items { public class TableWithBlueClothAddon : BaseAddon { - public override BaseAddonDeed Deed { get { return new TableWithBlueClothDeed(); } } + public override BaseAddonDeed Deed => new TableWithBlueClothDeed(); [Constructible] - public TableWithBlueClothAddon() : base() + public TableWithBlueClothAddon() { AddComponent( new LocalizedAddonComponent( 0x118C, 1076276 ), 0, 0, 0 ); } @@ -33,11 +33,11 @@ namespace Server.Items public class TableWithBlueClothDeed : BaseAddonDeed { - public override BaseAddon Addon { get { return new TableWithBlueClothAddon(); } } - public override int LabelNumber { get { return 1076276; } } // Table With A Blue Tablecloth + public override BaseAddon Addon => new TableWithBlueClothAddon(); + public override int LabelNumber => 1076276; // Table With A Blue Tablecloth [Constructible] - public TableWithBlueClothDeed() : base() + public TableWithBlueClothDeed() { LootType = LootType.Blessed; } diff --git a/Scripts/Items/Special/Heritage Items/TableWithOrangeCloth.cs b/Scripts/Items/Special/Heritage Items/TableWithOrangeCloth.cs index caea2be85..1c4b99336 100644 --- a/Scripts/Items/Special/Heritage Items/TableWithOrangeCloth.cs +++ b/Scripts/Items/Special/Heritage Items/TableWithOrangeCloth.cs @@ -4,10 +4,10 @@ namespace Server.Items { public class TableWithOrangeClothAddon : BaseAddon { - public override BaseAddonDeed Deed { get { return new TableWithOrangeClothDeed(); } } + public override BaseAddonDeed Deed => new TableWithOrangeClothDeed(); [Constructible] - public TableWithOrangeClothAddon() : base() + public TableWithOrangeClothAddon() { AddComponent( new LocalizedAddonComponent( 0x118E, 1076278 ), 0, 0, 0 ); } @@ -33,11 +33,11 @@ namespace Server.Items public class TableWithOrangeClothDeed : BaseAddonDeed { - public override BaseAddon Addon { get { return new TableWithOrangeClothAddon(); } } - public override int LabelNumber { get { return 1076278; } } // Table With An Orange Tablecloth + public override BaseAddon Addon => new TableWithOrangeClothAddon(); + public override int LabelNumber => 1076278; // Table With An Orange Tablecloth [Constructible] - public TableWithOrangeClothDeed() : base() + public TableWithOrangeClothDeed() { LootType = LootType.Blessed; } diff --git a/Scripts/Items/Special/Heritage Items/TableWithPurpleCloth.cs b/Scripts/Items/Special/Heritage Items/TableWithPurpleCloth.cs index e3459cd5e..622e6f1ef 100644 --- a/Scripts/Items/Special/Heritage Items/TableWithPurpleCloth.cs +++ b/Scripts/Items/Special/Heritage Items/TableWithPurpleCloth.cs @@ -4,10 +4,10 @@ namespace Server.Items { public class TableWithPurpleClothAddon : BaseAddon { - public override BaseAddonDeed Deed { get { return new TableWithPurpleClothDeed(); } } + public override BaseAddonDeed Deed => new TableWithPurpleClothDeed(); [Constructible] - public TableWithPurpleClothAddon() : base() + public TableWithPurpleClothAddon() { AddComponent( new LocalizedAddonComponent( 0x118B, 1076275 ), 0, 0, 0 ); } @@ -33,11 +33,11 @@ namespace Server.Items public class TableWithPurpleClothDeed : BaseAddonDeed { - public override BaseAddon Addon { get { return new TableWithPurpleClothAddon(); } } - public override int LabelNumber { get { return 1076275; } } // Table With A Purple Tablecloth + public override BaseAddon Addon => new TableWithPurpleClothAddon(); + public override int LabelNumber => 1076275; // Table With A Purple Tablecloth [Constructible] - public TableWithPurpleClothDeed() : base() + public TableWithPurpleClothDeed() { LootType = LootType.Blessed; } diff --git a/Scripts/Items/Special/Heritage Items/TableWithRedCloth.cs b/Scripts/Items/Special/Heritage Items/TableWithRedCloth.cs index 2a592db95..e546a2fb3 100644 --- a/Scripts/Items/Special/Heritage Items/TableWithRedCloth.cs +++ b/Scripts/Items/Special/Heritage Items/TableWithRedCloth.cs @@ -4,10 +4,10 @@ namespace Server.Items { public class TableWithRedClothAddon : BaseAddon { - public override BaseAddonDeed Deed { get { return new TableWithRedClothDeed(); } } + public override BaseAddonDeed Deed => new TableWithRedClothDeed(); [Constructible] - public TableWithRedClothAddon() : base() + public TableWithRedClothAddon() { AddComponent( new LocalizedAddonComponent( 0x118D, 1076277 ), 0, 0, 0 ); } @@ -33,11 +33,11 @@ namespace Server.Items public class TableWithRedClothDeed : BaseAddonDeed { - public override BaseAddon Addon { get { return new TableWithRedClothAddon(); } } - public override int LabelNumber { get { return 1076277; } } // Table With A Red Tablecloth + public override BaseAddon Addon => new TableWithRedClothAddon(); + public override int LabelNumber => 1076277; // Table With A Red Tablecloth [Constructible] - public TableWithRedClothDeed() : base() + public TableWithRedClothDeed() { LootType = LootType.Blessed; } diff --git a/Scripts/Items/Special/Heritage Items/UnmadeBed.cs b/Scripts/Items/Special/Heritage Items/UnmadeBed.cs index a32ae4b97..e249ac8aa 100644 --- a/Scripts/Items/Special/Heritage Items/UnmadeBed.cs +++ b/Scripts/Items/Special/Heritage Items/UnmadeBed.cs @@ -7,10 +7,10 @@ namespace Server.Items { public class UnmadeBedAddon : BaseAddon { - public override BaseAddonDeed Deed { get { return new UnmadeBedDeed(); } } + public override BaseAddonDeed Deed => new UnmadeBedDeed(); [Constructible] - public UnmadeBedAddon( bool east ) : base() + public UnmadeBedAddon( bool east ) { if ( east ) // east { @@ -49,13 +49,13 @@ namespace Server.Items public class UnmadeBedDeed : BaseAddonDeed { - public override BaseAddon Addon { get { return new UnmadeBedAddon( m_East ); } } - public override int LabelNumber { get { return 1076279; } } // Unmade Bed + public override BaseAddon Addon => new UnmadeBedAddon( m_East ); + public override int LabelNumber => 1076279; // Unmade Bed private bool m_East; [Constructible] - public UnmadeBedDeed() : base() + public UnmadeBedDeed() { LootType = LootType.Blessed; } diff --git a/Scripts/Items/Special/Heritage Items/Vanity.cs b/Scripts/Items/Special/Heritage Items/Vanity.cs index 79a0a005e..3c2df7cb4 100644 --- a/Scripts/Items/Special/Heritage Items/Vanity.cs +++ b/Scripts/Items/Special/Heritage Items/Vanity.cs @@ -7,10 +7,10 @@ namespace Server.Items { public class VanityAddon : BaseAddonContainer { - public override BaseAddonContainerDeed Deed { get { return new VanityDeed(); } } - public override int LabelNumber { get { return 1074027; } } // Vanity - public override int DefaultGumpID { get { return 0x51; } } - public override int DefaultDropSound { get { return 0x42; } } + public override BaseAddonContainerDeed Deed => new VanityDeed(); + public override int LabelNumber => 1074027; // Vanity + public override int DefaultGumpID => 0x51; + public override int DefaultDropSound => 0x42; [Constructible] public VanityAddon( bool east ) : base( east ? 0xA44 : 0xA3C ) @@ -46,13 +46,13 @@ namespace Server.Items public class VanityDeed : BaseAddonContainerDeed { - public override BaseAddonContainer Addon { get { return new VanityAddon( m_East ); } } - public override int LabelNumber { get { return 1074027; } } // Vanity + public override BaseAddonContainer Addon => new VanityAddon( m_East ); + public override int LabelNumber => 1074027; // Vanity private bool m_East; [Constructible] - public VanityDeed() : base() + public VanityDeed() { LootType = LootType.Blessed; } diff --git a/Scripts/Items/Special/Heritage Items/WallTorch.cs b/Scripts/Items/Special/Heritage Items/WallTorch.cs index d0be4d154..bdde25303 100644 --- a/Scripts/Items/Special/Heritage Items/WallTorch.cs +++ b/Scripts/Items/Special/Heritage Items/WallTorch.cs @@ -8,7 +8,7 @@ namespace Server.Items [Flippable( 0x3D98, 0x3D94 )] public class WallTorchComponent : AddonComponent { - public override int LabelNumber { get { return 1076282; } } // Wall Torch + public override int LabelNumber => 1076282; // Wall Torch public WallTorchComponent() : base( 0x3D98 ) { @@ -54,9 +54,9 @@ namespace Server.Items public class WallTorchAddon : BaseAddon { - public override BaseAddonDeed Deed { get { return new WallTorchDeed(); } } + public override BaseAddonDeed Deed => new WallTorchDeed(); - public WallTorchAddon() : base() + public WallTorchAddon() { AddComponent( new WallTorchComponent(), 0, 0, 0 ); } @@ -82,11 +82,11 @@ namespace Server.Items public class WallTorchDeed : BaseAddonDeed { - public override BaseAddon Addon { get { return new WallTorchAddon(); } } - public override int LabelNumber { get { return 1076282; } } // Wall Torch + public override BaseAddon Addon => new WallTorchAddon(); + public override int LabelNumber => 1076282; // Wall Torch [Constructible] - public WallTorchDeed() : base() + public WallTorchDeed() { LootType = LootType.Blessed; } diff --git a/Scripts/Items/Special/Heritage Items/WoodenCoffin.cs b/Scripts/Items/Special/Heritage Items/WoodenCoffin.cs index 1cb50abf0..e4d315308 100644 --- a/Scripts/Items/Special/Heritage Items/WoodenCoffin.cs +++ b/Scripts/Items/Special/Heritage Items/WoodenCoffin.cs @@ -7,7 +7,7 @@ namespace Server.Items { public class WoodenCoffinComponent : AddonComponent { - public override int LabelNumber { get { return 1076274; } } // Coffin + public override int LabelNumber => 1076274; // Coffin public WoodenCoffinComponent( int itemID ) : base( itemID ) { @@ -34,10 +34,10 @@ namespace Server.Items public class WoodenCoffinAddon : BaseAddon { - public override BaseAddonDeed Deed { get { return new WoodenCoffinDeed(); } } + public override BaseAddonDeed Deed => new WoodenCoffinDeed(); [Constructible] - public WoodenCoffinAddon( bool east ) : base() + public WoodenCoffinAddon( bool east ) { if ( east ) // east { @@ -74,13 +74,13 @@ namespace Server.Items public class WoodenCoffinDeed : BaseAddonDeed { - public override BaseAddon Addon { get { return new WoodenCoffinAddon( m_East ); } } - public override int LabelNumber { get { return 1076274; } } // Coffin + public override BaseAddon Addon => new WoodenCoffinAddon( m_East ); + public override int LabelNumber => 1076274; // Coffin private bool m_East; [Constructible] - public WoodenCoffinDeed() : base() + public WoodenCoffinDeed() { LootType = LootType.Blessed; } diff --git a/Scripts/Items/Special/HeritageToken.cs b/Scripts/Items/Special/HeritageToken.cs index 7fc588335..36dbbbefc 100644 --- a/Scripts/Items/Special/HeritageToken.cs +++ b/Scripts/Items/Special/HeritageToken.cs @@ -10,7 +10,7 @@ namespace Server.Items public class HeritageToken : Item { - public override int LabelNumber { get { return 1076596; } } // A Heritage Token + public override int LabelNumber => 1076596; // A Heritage Token [Constructible] public HeritageToken() : base( 0x367A ) diff --git a/Scripts/Items/Special/Holiday/Christmas/HolidayTree.cs b/Scripts/Items/Special/Holiday/Christmas/HolidayTree.cs index d4b753574..f0bc33f90 100644 --- a/Scripts/Items/Special/Holiday/Christmas/HolidayTree.cs +++ b/Scripts/Items/Special/Holiday/Christmas/HolidayTree.cs @@ -26,7 +26,7 @@ namespace Server.Items private class Ornament : Item { - public override int LabelNumber{ get{ return 1041118; } } // a tree ornament + public override int LabelNumber => 1041118; // a tree ornament public Ornament( int itemID ) : base( itemID ) { @@ -56,7 +56,7 @@ namespace Server.Items { private HolidayTree m_Tree; - public override int LabelNumber{ get{ return 1041117; } } // a tree for the holidays + public override int LabelNumber => 1041117; // a tree for the holidays public TreeTrunk( HolidayTree tree, int itemID ) : base( itemID ) { @@ -106,7 +106,7 @@ namespace Server.Items } } - public override int LabelNumber{ get{ return 1041117; } } // a tree for the holidays + public override int LabelNumber => 1041117; // a tree for the holidays public HolidayTree( Mobile from, HolidayTreeType type, Point3D loc ) : base( 1 ) { @@ -311,4 +311,4 @@ namespace Server.Items } } } -} \ No newline at end of file +} diff --git a/Scripts/Items/Special/Holiday/GingerBreadHouseDeed.cs b/Scripts/Items/Special/Holiday/GingerBreadHouseDeed.cs index 589384a2a..0b358207a 100644 --- a/Scripts/Items/Special/Holiday/GingerBreadHouseDeed.cs +++ b/Scripts/Items/Special/Holiday/GingerBreadHouseDeed.cs @@ -5,7 +5,7 @@ namespace Server.Items { public class GingerBreadHouseAddon : BaseAddon { - public override BaseAddonDeed Deed{ get{ return new GingerBreadHouseDeed(); } } + public override BaseAddonDeed Deed => new GingerBreadHouseDeed(); public GingerBreadHouseAddon() { @@ -13,7 +13,7 @@ namespace Server.Items { LocalizedAddonComponent laoc = new LocalizedAddonComponent( i, 1077395 ); // Gingerbread House laoc.Light = LightType.SouthSmall; - AddComponent( laoc, (i==0x2be5) ? -1 : 0, (i==0x2be7) ? -1 : 0, 0 ); + AddComponent( laoc, (i==0x2be5) ? -1 : 0, (i==0x2be7) ? -1 : 0, 0 ); } } @@ -36,11 +36,11 @@ namespace Server.Items public class GingerBreadHouseDeed : BaseAddonDeed { - public override int LabelNumber{ get{ return 1077394; } } //a Gingerbread House Deed - public override BaseAddon Addon{ get{ return new GingerBreadHouseAddon(); } } + public override int LabelNumber => 1077394; //a Gingerbread House Deed + public override BaseAddon Addon => new GingerBreadHouseAddon(); [Constructible] - public GingerBreadHouseDeed() + public GingerBreadHouseDeed() { Weight = 1.0; LootType = LootType.Blessed; diff --git a/Scripts/Items/Special/Holiday/HolidayFoods.cs b/Scripts/Items/Special/Holiday/HolidayFoods.cs index 04df58f10..baef5a3d4 100644 --- a/Scripts/Items/Special/Holiday/HolidayFoods.cs +++ b/Scripts/Items/Special/Holiday/HolidayFoods.cs @@ -25,7 +25,7 @@ namespace Server.Items private int m_Eaten; private Mobile m_Eater; - public Mobile Eater { get { return m_Eater; } } + public Mobile Eater => m_Eater; public int Eaten { get { return m_Eaten; } set { m_Eaten = value; } } public CandyCaneTimer( Mobile eater ) @@ -71,9 +71,7 @@ namespace Server.Items private static CandyCaneTimer EnsureTimer( Mobile from ) { - CandyCaneTimer timer; - - if ( !m_ToothAches.TryGetValue( from, out timer ) ) + if (!m_ToothAches.TryGetValue( from, out CandyCaneTimer timer )) m_ToothAches[from] = timer = new CandyCaneTimer( from ); return timer; @@ -81,9 +79,7 @@ namespace Server.Items public static int GetToothAche( Mobile from ) { - CandyCaneTimer timer; - - if ( m_ToothAches.TryGetValue( from, out timer ) ) + if (m_ToothAches.TryGetValue( from, out CandyCaneTimer timer )) return timer.Eaten; return 0; @@ -141,9 +137,9 @@ namespace Server.Items 1077396, // Noooo! 1077397, // Please don't eat me... *whimper* 1077405, // Not the face! - 1077406, // Ahhhhhh! My foot’s gone! + 1077406, // Ahhhhhh! My foot�s gone! 1077407, // Please. No! I have gingerkids! - 1077408, // No, no! I’m really made of poison. Really. + 1077408, // No, no! I�m really made of poison. Really. 1077409 // Run, run as fast as you can! You can't catch me! I'm the gingerbread man! }; diff --git a/Scripts/Items/Special/Holiday/HolidayGiftBoxes.cs b/Scripts/Items/Special/Holiday/HolidayGiftBoxes.cs index 92b2114fb..789da9e2b 100644 --- a/Scripts/Items/Special/Holiday/HolidayGiftBoxes.cs +++ b/Scripts/Items/Special/Holiday/HolidayGiftBoxes.cs @@ -46,7 +46,7 @@ namespace Server.Items [FlippableAttribute(0x46A5, 0x46A6)] public class GiftBoxRectangle : BaseContainer { - public override int DefaultGumpID { get { return 0x11E; } } + public override int DefaultGumpID => 0x11E; [Constructible] public GiftBoxRectangle() @@ -75,7 +75,7 @@ namespace Server.Items public class GiftBoxCube : BaseContainer { - public override int DefaultGumpID { get { return 0x11B; } } + public override int DefaultGumpID => 0x11B; [Constructible] public GiftBoxCube() @@ -104,7 +104,7 @@ namespace Server.Items public class GiftBoxCylinder : BaseContainer { - public override int DefaultGumpID { get { return 0x11C; } } + public override int DefaultGumpID => 0x11C; [Constructible] public GiftBoxCylinder() @@ -133,7 +133,7 @@ namespace Server.Items public class GiftBoxOctogon : BaseContainer { - public override int DefaultGumpID { get { return 0x11D; } } + public override int DefaultGumpID => 0x11D; [Constructible] public GiftBoxOctogon() @@ -162,7 +162,7 @@ namespace Server.Items public class GiftBoxAngel : BaseContainer { - public override int DefaultGumpID { get { return 0x11F; } } + public override int DefaultGumpID => 0x11F; [Constructible] public GiftBoxAngel() @@ -218,4 +218,4 @@ namespace Server.Items int version = reader.ReadInt(); } } -} \ No newline at end of file +} diff --git a/Scripts/Items/Special/Holiday/HolidayPottedPlant.cs b/Scripts/Items/Special/Holiday/HolidayPottedPlant.cs index f5f5b5567..dc4749711 100644 --- a/Scripts/Items/Special/Holiday/HolidayPottedPlant.cs +++ b/Scripts/Items/Special/Holiday/HolidayPottedPlant.cs @@ -7,7 +7,7 @@ namespace Server.Items { public class HolidayPottedPlant : Item { - public override bool ForceShowProperties { get { return ObjectPropertyList.Enabled; } } + public override bool ForceShowProperties => ObjectPropertyList.Enabled; [Constructible] public HolidayPottedPlant() @@ -43,8 +43,8 @@ namespace Server.Items public class PottedPlantDeed : Item { - public override int LabelNumber { get { return 1041114; } } // A deed for a potted plant. - public override double DefaultWeight { get { return 1.0; } } + public override int LabelNumber => 1041114; // A deed for a potted plant. + public override double DefaultWeight => 1.0; [Constructible] public PottedPlantDeed() diff --git a/Scripts/Items/Special/Holiday/HolidayTimepiece.cs b/Scripts/Items/Special/Holiday/HolidayTimepiece.cs index 06c821948..c98293832 100644 --- a/Scripts/Items/Special/Holiday/HolidayTimepiece.cs +++ b/Scripts/Items/Special/Holiday/HolidayTimepiece.cs @@ -5,8 +5,8 @@ namespace Server.Items { public class HolidayTimepiece : Clock { - public override int LabelNumber { get { return 1041113; } } // a holiday timepiece - public override double DefaultWeight { get { return 1.0; } } + public override int LabelNumber => 1041113; // a holiday timepiece + public override double DefaultWeight => 1.0; [Constructible] public HolidayTimepiece() diff --git a/Scripts/Items/Special/Holiday/IcyPatch.cs b/Scripts/Items/Special/Holiday/IcyPatch.cs index 6aacc2728..a8f02f37a 100644 --- a/Scripts/Items/Special/Holiday/IcyPatch.cs +++ b/Scripts/Items/Special/Holiday/IcyPatch.cs @@ -6,8 +6,8 @@ namespace Server.Items { public class IcyPatch : Item { - public override int LabelNumber { get { return 1095159; } } //An Icy Patch - public override double DefaultWeight { get { return 5.0; } } + public override int LabelNumber => 1095159; //An Icy Patch + public override double DefaultWeight => 5.0; /* On OSI, the iceypatch with itemid 0x122a is "rarer", so we will give it 1:10 chance of creating it that way */ @@ -122,4 +122,4 @@ namespace Server.Items int version = reader.ReadInt(); } } -} \ No newline at end of file +} diff --git a/Scripts/Items/Special/Holiday/SnowGlobes.cs b/Scripts/Items/Special/Holiday/SnowGlobes.cs index c9d37a2e8..e9c99c665 100644 --- a/Scripts/Items/Special/Holiday/SnowGlobes.cs +++ b/Scripts/Items/Special/Holiday/SnowGlobes.cs @@ -5,7 +5,7 @@ namespace Server.Items { public class SnowGlobe : Item { - public override double DefaultWeight { get { return 1.0; } } + public override double DefaultWeight => 1.0; public SnowGlobe() : base( 0xE2F ) @@ -68,7 +68,7 @@ namespace Server.Items set { m_Type = value; InvalidateProperties(); } } - public override int LabelNumber { get { return 1041454 + (int) m_Type; } } + public override int LabelNumber => 1041454 + (int) m_Type; [Constructible] public SnowGlobeOne() diff --git a/Scripts/Items/Special/Holiday/SnowPiles.cs b/Scripts/Items/Special/Holiday/SnowPiles.cs index a0a14d3ed..5ac226e0b 100644 --- a/Scripts/Items/Special/Holiday/SnowPiles.cs +++ b/Scripts/Items/Special/Holiday/SnowPiles.cs @@ -2,8 +2,8 @@ { public class SnowPileDeco : Item { - public override string DefaultName{ get { return "Snow Pile"; } } - public override double DefaultWeight{ get { return 2.0; } } + public override string DefaultName => "Snow Pile"; + public override double DefaultWeight => 2.0; private static readonly int[] m_Types = new int[] { 0x8E2, 0x8E0, 0x8E6, 0x8E5, 0x8E3 }; @@ -39,4 +39,4 @@ int version = reader.ReadInt(); } } -} \ No newline at end of file +} diff --git a/Scripts/Items/Special/Holiday/SnowStatue.cs b/Scripts/Items/Special/Holiday/SnowStatue.cs index 41e5b5b86..91acf7648 100644 --- a/Scripts/Items/Special/Holiday/SnowStatue.cs +++ b/Scripts/Items/Special/Holiday/SnowStatue.cs @@ -8,7 +8,7 @@ namespace Server.Items [Flippable( 0x456E, 0x456F )] public class SnowStatuePegasus : Item { - public override bool ForceShowProperties { get { return ObjectPropertyList.Enabled; } } + public override bool ForceShowProperties => ObjectPropertyList.Enabled; [Constructible] public SnowStatuePegasus() @@ -39,7 +39,7 @@ namespace Server.Items [Flippable( 0x4578, 0x4579 )] public class SnowStatueSeahorse : Item { - public override bool ForceShowProperties { get { return ObjectPropertyList.Enabled; } } + public override bool ForceShowProperties => ObjectPropertyList.Enabled; [Constructible] public SnowStatueSeahorse() @@ -70,7 +70,7 @@ namespace Server.Items [Flippable( 0x457A, 0x457B )] public class SnowStatueMermaid : Item { - public override bool ForceShowProperties { get { return ObjectPropertyList.Enabled; } } + public override bool ForceShowProperties => ObjectPropertyList.Enabled; [Constructible] public SnowStatueMermaid() @@ -101,7 +101,7 @@ namespace Server.Items [Flippable( 0x457C, 0x457D )] public class SnowStatueGriffon : Item { - public override bool ForceShowProperties { get { return ObjectPropertyList.Enabled; } } + public override bool ForceShowProperties => ObjectPropertyList.Enabled; [Constructible] public SnowStatueGriffon() @@ -131,8 +131,8 @@ namespace Server.Items public class SnowStatueDeed : Item { - public override int LabelNumber { get { return 1114296; } } // snow statue deed - public override double DefaultWeight { get { return 1.0; } } + public override int LabelNumber => 1114296; // snow statue deed + public override double DefaultWeight => 1.0; [Constructible] public SnowStatueDeed() diff --git a/Scripts/Items/Special/Holiday/Stockings.cs b/Scripts/Items/Special/Holiday/Stockings.cs index aad78e778..3c003aae8 100644 --- a/Scripts/Items/Special/Holiday/Stockings.cs +++ b/Scripts/Items/Special/Holiday/Stockings.cs @@ -7,8 +7,8 @@ namespace Server.Items [FlippableAttribute( 0x2bd9, 0x2bda )] public class GreenStocking : BaseContainer { - public override int DefaultGumpID{ get{ return 0x103; } } - public override int DefaultDropSound{ get{ return 0x42; } } + public override int DefaultGumpID => 0x103; + public override int DefaultDropSound => 0x42; [Constructible] public GreenStocking() : base ( Utility.Random( 0x2BD9, 2 ) ) @@ -36,8 +36,8 @@ namespace Server.Items [FlippableAttribute( 0x2bdb, 0x2bdc )] public class RedStocking : BaseContainer { - public override int DefaultGumpID{ get{ return 0x103; } } - public override int DefaultDropSound{ get{ return 0x42; } } + public override int DefaultGumpID => 0x103; + public override int DefaultDropSound => 0x42; [Constructible] public RedStocking() : base ( Utility.Random( 0x2BDB, 2 ) ) diff --git a/Scripts/Items/Special/Holiday/Wreath.cs b/Scripts/Items/Special/Holiday/Wreath.cs index 6274250be..8f97a0929 100644 --- a/Scripts/Items/Special/Holiday/Wreath.cs +++ b/Scripts/Items/Special/Holiday/Wreath.cs @@ -119,7 +119,7 @@ namespace Server.Items return false; } } - else + else { return false; } @@ -170,7 +170,7 @@ namespace Server.Items [Flippable( 0x14F0, 0x14EF )] public class WreathDeed : Item { - public override int LabelNumber{ get{ return 1062837; } } // holiday wreath deed + public override int LabelNumber => 1062837; // holiday wreath deed [Constructible] public WreathDeed() : this( Utility.RandomDyedHue() ) @@ -325,4 +325,4 @@ namespace Server.Items } } } -} \ No newline at end of file +} diff --git a/Scripts/Items/Special/Holiday/WristWatch.cs b/Scripts/Items/Special/Holiday/WristWatch.cs index 565485f33..025543f82 100644 --- a/Scripts/Items/Special/Holiday/WristWatch.cs +++ b/Scripts/Items/Special/Holiday/WristWatch.cs @@ -5,8 +5,8 @@ namespace Server.Items { public class WristWatch : Clock { - public override int LabelNumber { get { return 1041421; } } // a wrist watch - public override double DefaultWeight { get { return 1.0; } } + public override int LabelNumber => 1041421; // a wrist watch + public override double DefaultWeight => 1.0; [Constructible] public WristWatch() diff --git a/Scripts/Items/Special/ML/GrizzledMareStatuette.cs b/Scripts/Items/Special/ML/GrizzledMareStatuette.cs index 8fd2fa5e7..a8cf9b196 100644 --- a/Scripts/Items/Special/ML/GrizzledMareStatuette.cs +++ b/Scripts/Items/Special/ML/GrizzledMareStatuette.cs @@ -6,8 +6,8 @@ namespace Server.Items { public class GrizzledMareStatuette : BaseImprisonedMobile { - public override int LabelNumber{ get{ return 1074475; } } // Grizzled Mare Statuette - public override BaseCreature Summon{ get { return new GrizzledMare(); } } + public override int LabelNumber => 1074475; // Grizzled Mare Statuette + public override BaseCreature Summon => new GrizzledMare(); [Constructible] public GrizzledMareStatuette() : base( 0x2617 ) diff --git a/Scripts/Items/Special/MiniHouses.cs b/Scripts/Items/Special/MiniHouses.cs index 1986bee55..1a36c066d 100644 --- a/Scripts/Items/Special/MiniHouses.cs +++ b/Scripts/Items/Special/MiniHouses.cs @@ -14,7 +14,7 @@ namespace Server.Items set{ m_Type = value; Construct(); } } - public override BaseAddonDeed Deed{ get{ return new MiniHouseDeed( m_Type ); } } + public override BaseAddonDeed Deed => new MiniHouseDeed( m_Type ); [Constructible] public MiniHouseAddon() : this( MiniHouseType.StoneAndPlaster ) @@ -91,8 +91,8 @@ namespace Server.Items set{ m_Type = value; InvalidateProperties(); } } - public override BaseAddon Addon{ get{ return new MiniHouseAddon( m_Type ); } } - public override int LabelNumber{ get{ return 1062096; } } // a mini house deed + public override BaseAddon Addon => new MiniHouseAddon( m_Type ); + public override int LabelNumber => 1062096; // a mini house deed public override void GetProperties( ObjectPropertyList list ) { @@ -168,7 +168,7 @@ namespace Server.Items TwoStoryLogCabin, TwoStoryVilla, SandstoneHouseWithPatio, - SmallStoneWorkshop, + SmallStoneWorkshop, SmallMarbleWorkshop, MalasMountainPass, //Veteran reward house ChurchAtNight //Veteran reward house @@ -234,4 +234,4 @@ namespace Server.Items return m_Info[v]; } } -} \ No newline at end of file +} diff --git a/Scripts/Items/Special/Mutation Core/PlagueBeastBackpack.cs b/Scripts/Items/Special/Mutation Core/PlagueBeastBackpack.cs index 04e3446b1..ff57d53ac 100644 --- a/Scripts/Items/Special/Mutation Core/PlagueBeastBackpack.cs +++ b/Scripts/Items/Special/Mutation Core/PlagueBeastBackpack.cs @@ -6,10 +6,10 @@ namespace Server.Items { public class PlagueBeastBackpack : BaseContainer { - public override int DefaultMaxWeight { get { return 0; } } - public override int DefaultMaxItems { get { return 0; } } - public override int DefaultGumpID { get { return 0x2A63; } } - public override int DefaultDropSound { get { return 0x23F; } } + public override int DefaultMaxWeight => 0; + public override int DefaultMaxItems => 0; + public override int DefaultGumpID => 0x2A63; + public override int DefaultDropSound => 0x23F; private static int[,,] m_Positions = new int[,,] { diff --git a/Scripts/Items/Special/Mutation Core/PlagueBeastOrgans.cs b/Scripts/Items/Special/Mutation Core/PlagueBeastOrgans.cs index b7dd9e6e8..ea59f064e 100644 --- a/Scripts/Items/Special/Mutation Core/PlagueBeastOrgans.cs +++ b/Scripts/Items/Special/Mutation Core/PlagueBeastOrgans.cs @@ -7,7 +7,7 @@ namespace Server.Items { public class PlagueBeastOrgan : PlagueBeastInnard { - public virtual bool IsCuttable { get { return false; } } + public virtual bool IsCuttable => false; private List m_Components; @@ -246,7 +246,7 @@ namespace Server.Items { private int m_Veins; - public PlagueBeastRubbleOrgan() : base() + public PlagueBeastRubbleOrgan() { m_Veins = 3; } @@ -474,7 +474,7 @@ namespace Server.Items get { return m_Brains >= 4; } } - public PlagueBeastMainOrgan() : base() + public PlagueBeastMainOrgan() { m_Brains = 0; } diff --git a/Scripts/Items/Special/Rares/Containers/BaseWaterContainer.cs b/Scripts/Items/Special/Rares/Containers/BaseWaterContainer.cs index 2d833e85a..e85622279 100644 --- a/Scripts/Items/Special/Rares/Containers/BaseWaterContainer.cs +++ b/Scripts/Items/Special/Rares/Containers/BaseWaterContainer.cs @@ -6,7 +6,7 @@ public abstract int fullItem_ID { get; } public abstract int MaxQuantity { get; } - public override int DefaultGumpID { get { return 0x3e; } } + public override int DefaultGumpID => 0x3e; [CommandProperty( AccessLevel.GameMaster )] public virtual bool IsEmpty { get { return ( m_Quantity <= 0 ); } } @@ -129,4 +129,4 @@ m_Quantity = reader.ReadInt(); } } -} \ No newline at end of file +} diff --git a/Scripts/Items/Special/Rares/Containers/Bucket.cs b/Scripts/Items/Special/Rares/Containers/Bucket.cs index 01f96cb3d..bc5437820 100644 --- a/Scripts/Items/Special/Rares/Containers/Bucket.cs +++ b/Scripts/Items/Special/Rares/Containers/Bucket.cs @@ -2,9 +2,9 @@ { class Bucket : BaseWaterContainer { - public override int voidItem_ID { get { return vItemID; } } - public override int fullItem_ID { get { return fItemID; } } - public override int MaxQuantity { get { return 25; } } + public override int voidItem_ID => vItemID; + public override int fullItem_ID => fItemID; + public override int MaxQuantity => 25; private static int vItemID = 0x14e0; private static int fItemID = 0x2004; @@ -40,4 +40,4 @@ int version = reader.ReadInt(); } } -} \ No newline at end of file +} diff --git a/Scripts/Items/Special/Rares/Containers/ClosedBarrel.cs b/Scripts/Items/Special/Rares/Containers/ClosedBarrel.cs index 9bf5295d2..eba8dadc0 100644 --- a/Scripts/Items/Special/Rares/Containers/ClosedBarrel.cs +++ b/Scripts/Items/Special/Rares/Containers/ClosedBarrel.cs @@ -1,8 +1,8 @@ namespace Server.Items { class ClosedBarrel : TrappableContainer - { - public override int DefaultGumpID{ get { return 0x3e; } } + { + public override int DefaultGumpID => 0x3e; [Constructible] public ClosedBarrel() @@ -29,4 +29,4 @@ int version = reader.ReadInt(); } } -} \ No newline at end of file +} diff --git a/Scripts/Items/Special/Rares/Containers/WaterBarrel.cs b/Scripts/Items/Special/Rares/Containers/WaterBarrel.cs index feb457391..74eb0b3cc 100644 --- a/Scripts/Items/Special/Rares/Containers/WaterBarrel.cs +++ b/Scripts/Items/Special/Rares/Containers/WaterBarrel.cs @@ -2,11 +2,11 @@ { class WaterBarrel : BaseWaterContainer { - public override int LabelNumber { get { return 1025453; } } /* water barrel */ + public override int LabelNumber => 1025453; /* water barrel */ - public override int voidItem_ID { get { return vItemID; } } - public override int fullItem_ID { get { return fItemID; } } - public override int MaxQuantity { get { return 100; } } + public override int voidItem_ID => vItemID; + public override int fullItem_ID => fItemID; + public override int MaxQuantity => 100; private static int vItemID = 0xe77; private static int fItemID = 0x154d; @@ -42,4 +42,4 @@ int version = reader.ReadInt(); } } -} \ No newline at end of file +} diff --git a/Scripts/Items/Special/Rares/Containers/WaterTub.cs b/Scripts/Items/Special/Rares/Containers/WaterTub.cs index 974070958..ee8b49318 100644 --- a/Scripts/Items/Special/Rares/Containers/WaterTub.cs +++ b/Scripts/Items/Special/Rares/Containers/WaterTub.cs @@ -2,9 +2,9 @@ { class Tub : BaseWaterContainer { - public override int voidItem_ID { get { return vItemID; } } - public override int fullItem_ID { get { return fItemID; } } - public override int MaxQuantity { get { return 50; } } + public override int voidItem_ID => vItemID; + public override int fullItem_ID => fItemID; + public override int MaxQuantity => 50; private static int vItemID = 0xe83; private static int fItemID = 0xe7b; @@ -40,4 +40,4 @@ int version = reader.ReadInt(); } } -} \ No newline at end of file +} diff --git a/Scripts/Items/Special/RewardCake.cs b/Scripts/Items/Special/RewardCake.cs index 17a4b3279..60ca1f545 100644 --- a/Scripts/Items/Special/RewardCake.cs +++ b/Scripts/Items/Special/RewardCake.cs @@ -6,7 +6,7 @@ namespace Server.Items { public class RewardCake : Item { - public override int LabelNumber{ get{ return 1049786; } } // Happy Birthday! ... + public override int LabelNumber => 1049786; // Happy Birthday! ... [Constructible] public RewardCake() : base( 0x9e9 ) diff --git a/Scripts/Items/Special/Solen Items/BagOfSending.cs b/Scripts/Items/Special/Solen Items/BagOfSending.cs index a109827d9..0ad74ba89 100644 --- a/Scripts/Items/Special/Solen Items/BagOfSending.cs +++ b/Scripts/Items/Special/Solen Items/BagOfSending.cs @@ -73,7 +73,7 @@ namespace Server.Items public string TranslocationItemName{ get{ return "bag of sending"; } } - public override int LabelNumber{ get{ return 1054104; } } // a bag of sending + public override int LabelNumber => 1054104; // a bag of sending [CommandProperty( AccessLevel.GameMaster )] public BagOfSendingHue BagOfSendingHue @@ -280,4 +280,4 @@ namespace Server.Items } } } -} \ No newline at end of file +} diff --git a/Scripts/Items/Special/Solen Items/BallOfSummoning.cs b/Scripts/Items/Special/Solen Items/BallOfSummoning.cs index 637f6fe52..7fbcbd3c6 100644 --- a/Scripts/Items/Special/Solen Items/BallOfSummoning.cs +++ b/Scripts/Items/Special/Solen Items/BallOfSummoning.cs @@ -401,7 +401,7 @@ namespace Server.Items return TimeSpan.Zero; } - public override double CastDelayFastScalar { get { return 0; } } + public override double CastDelayFastScalar => 0; public override TimeSpan CastDelayBase { diff --git a/Scripts/Items/Special/SoulStone.cs b/Scripts/Items/Special/SoulStone.cs index 0d3b9ceb5..c42f75837 100644 --- a/Scripts/Items/Special/SoulStone.cs +++ b/Scripts/Items/Special/SoulStone.cs @@ -11,7 +11,7 @@ namespace Server.Items { public class SoulStone : Item, ISecurable { - public override int LabelNumber { get { return 1030899; } } // soulstone + public override int LabelNumber => 1030899; // soulstone private int m_ActiveItemID; private int m_InactiveItemID; @@ -819,7 +819,7 @@ namespace Server.Items { private int m_UsesRemaining; - public override int LabelNumber { get { return 1071000; } } // soulstone fragment + public override int LabelNumber => 1071000; // soulstone fragment [Constructible] public SoulstoneFragment() : this( 5, null ) @@ -1029,4 +1029,4 @@ namespace Server.Items } } } -} \ No newline at end of file +} diff --git a/Scripts/Items/Special/Special Scrolls/PowerScroll.cs b/Scripts/Items/Special/Special Scrolls/PowerScroll.cs index 29a497f05..419b1b497 100644 --- a/Scripts/Items/Special/Special Scrolls/PowerScroll.cs +++ b/Scripts/Items/Special/Special Scrolls/PowerScroll.cs @@ -9,7 +9,7 @@ namespace Server.Items { public class PowerScroll : SpecialScroll { - public override int Message { get { return 1049469; } } /* Using a scroll increases the maximum amount of a specific skill or your maximum statistics. + public override int Message => 1049469; /* Using a scroll increases the maximum amount of a specific skill or your maximum statistics. * When used, the effect is not immediately seen without a gain of points with that skill or statistics. * You can view your maximum skill values in your skills window. * You can view your maximum statistic value in your statistics window. */ @@ -29,7 +29,7 @@ namespace Server.Items } } - public override string DefaultTitle{ get{ return String.Format( "Power Scroll ({0} Skill):", Value ); } } + public override string DefaultTitle => String.Format( "Power Scroll ({0} Skill):", Value ); private static SkillName[] m_Skills = new SkillName[] { @@ -253,4 +253,4 @@ namespace Server.Items } } } -} \ No newline at end of file +} diff --git a/Scripts/Items/Special/Special Scrolls/ScrollofAlacrity.cs b/Scripts/Items/Special/Special Scrolls/ScrollofAlacrity.cs index 15deb61ff..b0302b17f 100644 --- a/Scripts/Items/Special/Special Scrolls/ScrollofAlacrity.cs +++ b/Scripts/Items/Special/Special Scrolls/ScrollofAlacrity.cs @@ -31,18 +31,18 @@ namespace Server.Items { public class ScrollofAlacrity : SpecialScroll { - public override int LabelNumber { get { return 1078604; } } // Scroll of Alacrity - - public override int Message { get { return 1078602; } } /*Using a Scroll of Transcendence for a given skill will permanently increase your current + public override int LabelNumber => 1078604; // Scroll of Alacrity + + public override int Message => 1078602; /*Using a Scroll of Transcendence for a given skill will permanently increase your current *level in that skill by the amount of points displayed on the scroll. *As you may not gain skills beyond your maximum skill cap, any excess points will be lost.*/ - - public override string DefaultTitle { get { return String.Format( "Scroll of Alacrity:" ); } } + + public override string DefaultTitle => String.Format( "Scroll of Alacrity:" ); public ScrollofAlacrity() : this( SkillName.Alchemy ) { } - + [Constructible] public ScrollofAlacrity( SkillName skill ) : base( skill, 0.0 ) { @@ -60,20 +60,20 @@ namespace Server.Items list.Add(1071345, "{0} 15 Minutes", GetName()); // Skill: ~1_val~ } - + public override bool CanUse( Mobile from ) { if ( !base.CanUse( from ) ) return false; - + PlayerMobile pm = from as PlayerMobile; - + if ( pm == null ) return false; - + #region Mondain's Legacy /* to add when skillgain quests will be implemented - + for (int i = pm.Quests.Count - 1; i >= 0; i--) { BaseQuest quest = pm.Quests[i]; @@ -89,10 +89,10 @@ namespace Server.Items } } } - + */ #endregion - + #region Scroll of Alacrity if (pm.AcceleratedStart > DateTime.UtcNow) { @@ -100,7 +100,7 @@ namespace Server.Items return false; } #endregion - + return true; } @@ -108,12 +108,12 @@ namespace Server.Items { if ( !CanUse( from ) ) return; - + PlayerMobile pm = from as PlayerMobile; - + if ( pm == null ) return; - + double tskill = from.Skills[Skill].Base; double tcap = from.Skills[Skill].Cap; @@ -123,9 +123,9 @@ namespace Server.Items *If you are at your total skill cap, you must use a Powerscroll to increase your current skill cap.*/ return; } - + from.SendLocalizedMessage( 1077956 ); // You are infused with intense energy. You are under the effects of an accelerated skillgain scroll. - + Effects.PlaySound( from.Location, from.Map, 0x1E9 ); Effects.SendTargetParticles( from, 0x373A, 35, 45, 0x00, 0x00, 9502, (EffectLayer)255, 0x100 ); diff --git a/Scripts/Items/Special/Special Scrolls/ScrollofTranscendence.cs b/Scripts/Items/Special/Special Scrolls/ScrollofTranscendence.cs index 14f9522b1..b3f9d252f 100644 --- a/Scripts/Items/Special/Special Scrolls/ScrollofTranscendence.cs +++ b/Scripts/Items/Special/Special Scrolls/ScrollofTranscendence.cs @@ -9,13 +9,13 @@ namespace Server.Items { public class ScrollofTranscendence : SpecialScroll { - public override int LabelNumber { get { return 1094934; } } // Scroll of Transcendence - - public override int Message { get { return 1094933; } } /*Using a Scroll of Transcendence for a given skill will permanently increase your current + public override int LabelNumber => 1094934; // Scroll of Transcendence + + public override int Message => 1094933; /*Using a Scroll of Transcendence for a given skill will permanently increase your current *level in that skill by the amount of points displayed on the scroll. *As you may not gain skills beyond your maximum skill cap, any excess points will be lost.*/ - - public override string DefaultTitle { get { return String.Format( "Scroll of Transcendence ({0} Skill):", Value ); } } + + public override string DefaultTitle => String.Format( "Scroll of Transcendence ({0} Skill):", Value ); public static ScrollofTranscendence CreateRandom( int min, int max ) { @@ -27,7 +27,7 @@ namespace Server.Items public ScrollofTranscendence() : this( SkillName.Alchemy, 0.0 ) { } - + [Constructible] public ScrollofTranscendence( SkillName skill, double value ) : base( skill, value ) { @@ -48,20 +48,20 @@ namespace Server.Items else list.Add(1076759, "{0}\t{1} Skill Points", GetName(), Value); } - + public override bool CanUse( Mobile from ) { if ( !base.CanUse( from ) ) return false; - + PlayerMobile pm = from as PlayerMobile; - + if ( pm == null ) return false; - + #region Mondain's Legacy /* to add when skillgain quests will be implemented - + for (int i = pm.Quests.Count - 1; i >= 0; i--) { BaseQuest quest = pm.Quests[i]; @@ -77,10 +77,10 @@ namespace Server.Items } } } - + */ #endregion - + #region Scroll of Alacrity if (pm.AcceleratedStart > DateTime.UtcNow) { @@ -88,7 +88,7 @@ namespace Server.Items return false; } #endregion - + return true; } @@ -96,11 +96,11 @@ namespace Server.Items { if ( !CanUse( from ) ) return; - + double tskill = from.Skills[Skill].Base; // value of skill without item bonuses etc double tcap = from.Skills[Skill].Cap; // maximum value permitted bool canGain = false; - + double newValue = Value; if ( ( tskill + newValue ) > tcap ) @@ -126,7 +126,7 @@ namespace Server.Items else canGain = true; } - + if ( !canGain ) { from.SendLocalizedMessage( 1094935 ); /*You cannot increase this skill at this time. The skill may be locked or set to lower in your skill menu. @@ -135,7 +135,7 @@ namespace Server.Items } from.SendLocalizedMessage( 1049513, GetNameLocalized() ); // You feel a surge of magic as the scroll enhances your ~1_type~! - + from.Skills[Skill].Base += newValue; Effects.PlaySound( from.Location, from.Map, 0x1F7 ); @@ -144,7 +144,7 @@ namespace Server.Items Delete(); } - + public override void Serialize( GenericWriter writer ) { base.Serialize(writer); diff --git a/Scripts/Items/Special/Special Scrolls/SpecialScroll.cs b/Scripts/Items/Special/Special Scrolls/SpecialScroll.cs index 294169a6a..448934e95 100644 --- a/Scripts/Items/Special/Special Scrolls/SpecialScroll.cs +++ b/Scripts/Items/Special/Special Scrolls/SpecialScroll.cs @@ -21,7 +21,7 @@ namespace Server.Items #endregion public abstract int Message{ get; } - public virtual int Title{ get { return 0; } } + public virtual int Title => 0; public abstract string DefaultTitle{ get; } public SpecialScroll( SkillName skill, double value ) : base( 0x14F0 ) diff --git a/Scripts/Items/Special/Special Scrolls/StatScroll.cs b/Scripts/Items/Special/Special Scrolls/StatScroll.cs index 9d23663b6..32827b186 100644 --- a/Scripts/Items/Special/Special Scrolls/StatScroll.cs +++ b/Scripts/Items/Special/Special Scrolls/StatScroll.cs @@ -8,11 +8,11 @@ namespace Server.Items { public class StatCapScroll : SpecialScroll { - public override int Message { get { return 1049469; } } /* Using a scroll increases the maximum amount of a specific skill or your maximum statistics. + public override int Message => 1049469; /* Using a scroll increases the maximum amount of a specific skill or your maximum statistics. * When used, the effect is not immediately seen without a gain of points with that skill or statistics. * You can view your maximum skill values in your skills window. * You can view your maximum statistic value in your statistics window. */ - public override int Title + public override int Title { get { @@ -24,17 +24,17 @@ namespace Server.Items * Mythical Scroll (+15 Maximum Stats): OR * Legendary Scroll (+20 Maximum Stats): OR * Ultimate Scroll (+25 Maximum Stats): */ - + return 0; } } - - public override string DefaultTitle { get { return String.Format( "Power Scroll ({0}{1} Maximum Stats):", ( (int)Value - 225 ) >= 0 ? "+" : "", (int)Value - 225 ); } } + + public override string DefaultTitle => String.Format( "Power Scroll ({0}{1} Maximum Stats):", ( (int)Value - 225 ) >= 0 ? "+" : "", (int)Value - 225 ); public StatCapScroll() : this( 105 ) { } - + [Constructible] public StatCapScroll( int value ) : base( SkillName.Alchemy, value ) { @@ -48,7 +48,7 @@ namespace Server.Items public override void AddNameProperty(ObjectPropertyList list) { int level = ( (int)Value - 230 ) / 5; - + if ( level >= 0 && level <= 4 && (int)Value % 5 == 0 ) list.Add( 1049463 + level, "#1049476" ); /* a wonderous scroll of ~1_type~ (+5 Maximum Stats) OR * an exalted scroll of ~1_type~ (+10 Maximum Stats) OR @@ -62,32 +62,32 @@ namespace Server.Items public override void OnSingleClick( Mobile from ) { int level = ( (int)Value - 230 ) / 5; - + if ( level >= 0 && level <= 4 && (int)Value % 5 == 0 ) base.LabelTo( from, 1049463 + level, "#1049476" ); else base.LabelTo( from, "a scroll of power ({0}{1} Maximum Stats)", (Value - 225) >= 0 ? "+" : "", Value - 225 ); } - + public override bool CanUse( Mobile from ) { if ( !base.CanUse( from ) ) return false; - + int newValue = (int)Value; - + if ( from is PlayerMobile && ((PlayerMobile)from).HasStatReward ) newValue += 5; - + if ( from.StatCap >= newValue ) { from.SendLocalizedMessage( 1049510 ); // Your stats are too high for this power scroll. return false; } - + return true; } - + public override void Use( Mobile from ) { if ( !CanUse( from ) ) @@ -129,4 +129,4 @@ namespace Server.Items Insured = false; } } -} \ No newline at end of file +} diff --git a/Scripts/Items/Special/Valentines/2007/RedVelvetGiftBox.cs b/Scripts/Items/Special/Valentines/2007/RedVelvetGiftBox.cs index b463135ab..aa169bb03 100644 --- a/Scripts/Items/Special/Valentines/2007/RedVelvetGiftBox.cs +++ b/Scripts/Items/Special/Valentines/2007/RedVelvetGiftBox.cs @@ -10,8 +10,8 @@ namespace Server.Items { public class RedVelvetGiftBox : BaseContainer { - public override int DefaultGumpID { get { return 0x3f; } } - public override int LabelNumber { get { return 1077596; } } // A Red Velvet Box + public override int DefaultGumpID => 0x3f; + public override int LabelNumber => 1077596; // A Red Velvet Box [Constructible] public RedVelvetGiftBox() @@ -62,4 +62,4 @@ namespace Server.Items int version = reader.ReadInt(); } } -} \ No newline at end of file +} diff --git a/Scripts/Items/Special/Valentines/2007/RoseInAVase.cs b/Scripts/Items/Special/Valentines/2007/RoseInAVase.cs index 0b9794d23..f9ef7c2ac 100644 --- a/Scripts/Items/Special/Valentines/2007/RoseInAVase.cs +++ b/Scripts/Items/Special/Valentines/2007/RoseInAVase.cs @@ -5,7 +5,7 @@ namespace Server.Items { public class RoseInAVase : Item /* TODO: when dye tub changes are implemented, furny dyable this */ { - public override int LabelNumber { get { return 1023760; } } // A Rose in a Vase 1023760 + public override int LabelNumber => 1023760; // A Rose in a Vase 1023760 [Constructible] public RoseInAVase( ) @@ -34,4 +34,4 @@ namespace Server.Items int version = reader.ReadInt(); } } -} \ No newline at end of file +} diff --git a/Scripts/Items/Special/Valentines/2007/ValentinesCard.cs b/Scripts/Items/Special/Valentines/2007/ValentinesCard.cs index a8af22fdc..3faa3008d 100644 --- a/Scripts/Items/Special/Valentines/2007/ValentinesCard.cs +++ b/Scripts/Items/Special/Valentines/2007/ValentinesCard.cs @@ -6,7 +6,7 @@ namespace Server.Items { public class ValentinesCard : Item { - public override string DefaultName { get { return "a Valentine's card"; } } + public override string DefaultName => "a Valentine's card"; [CommandProperty(AccessLevel.GameMaster)] public virtual string From { get { return m_From; } set { m_From = value; } } @@ -187,4 +187,4 @@ namespace Server.Items int version = reader.ReadInt(); } } -} \ No newline at end of file +} diff --git a/Scripts/Items/Special/Veteran Rewards/AnkhOfSacrifice.cs b/Scripts/Items/Special/Veteran Rewards/AnkhOfSacrifice.cs index 952c70860..a6ab148a8 100644 --- a/Scripts/Items/Special/Veteran Rewards/AnkhOfSacrifice.cs +++ b/Scripts/Items/Special/Veteran Rewards/AnkhOfSacrifice.cs @@ -12,7 +12,7 @@ namespace Server.Items public class AnkhOfSacrificeComponent : AddonComponent { public override bool ForceShowProperties => ObjectPropertyList.Enabled; - public override int LabelNumber{ get{ return 1027772; } } // Ankh of Sacrifice + public override int LabelNumber => 1027772; // Ankh of Sacrifice public AnkhOfSacrificeComponent( int itemID ) : base( itemID ) { @@ -175,7 +175,7 @@ namespace Server.Items } [Constructible] - public AnkhOfSacrificeAddon( bool east ) : base() + public AnkhOfSacrificeAddon( bool east ) { if ( east ) { @@ -228,7 +228,7 @@ namespace Server.Items public class AnkhOfSacrificeDeed : BaseAddonDeed, IRewardItem, IRewardOption { - public override int LabelNumber{ get{ return 1080397; } } // Deed For An Ankh Of Sacrifice + public override int LabelNumber => 1080397; // Deed For An Ankh Of Sacrifice public override BaseAddon Addon { @@ -257,7 +257,7 @@ namespace Server.Items } [Constructible] - public AnkhOfSacrificeDeed( bool isRewardItem ) : base() + public AnkhOfSacrificeDeed( bool isRewardItem ) { LootType = LootType.Blessed; diff --git a/Scripts/Items/Special/Veteran Rewards/Banner.cs b/Scripts/Items/Special/Veteran Rewards/Banner.cs index bc56e496a..72f747e21 100644 --- a/Scripts/Items/Special/Veteran Rewards/Banner.cs +++ b/Scripts/Items/Special/Veteran Rewards/Banner.cs @@ -116,7 +116,7 @@ namespace Server.Items public class BannerDeed : Item, IRewardItem { - public override int LabelNumber{ get{ return 1041007; } } // a banner deed + public override int LabelNumber => 1041007; // a banner deed private bool m_IsRewardItem; diff --git a/Scripts/Items/Special/Veteran Rewards/BloodyPentagram.cs b/Scripts/Items/Special/Veteran Rewards/BloodyPentagram.cs index abfb45632..4060fd581 100644 --- a/Scripts/Items/Special/Veteran Rewards/BloodyPentagram.cs +++ b/Scripts/Items/Special/Veteran Rewards/BloodyPentagram.cs @@ -9,7 +9,7 @@ namespace Server.Items public class BloodyPentagramComponent : AddonComponent { public override bool DisplayWeight => false; - public override int LabelNumber{ get{ return 1080279; } } // Bloody Pentagram + public override int LabelNumber => 1080279; // Bloody Pentagram public BloodyPentagramComponent( int itemID ) : base( itemID ) { @@ -57,7 +57,7 @@ namespace Server.Items } [Constructible] - public BloodyPentagramAddon() : base() + public BloodyPentagramAddon() { AddComponent( new BloodyPentagramComponent( 0x1CF9 ), 0, 1, 0 ); AddComponent( new BloodyPentagramComponent( 0x1CF8 ), 0, 2, 0 ); @@ -125,7 +125,7 @@ namespace Server.Items public class BloodyPentagramDeed : BaseAddonDeed, IRewardItem { - public override int LabelNumber{ get{ return 1080384; } } // Bloody Pentagram + public override int LabelNumber => 1080384; // Bloody Pentagram public override BaseAddon Addon { @@ -148,7 +148,7 @@ namespace Server.Items } [Constructible] - public BloodyPentagramDeed() : base() + public BloodyPentagramDeed() { LootType = LootType.Blessed; } diff --git a/Scripts/Items/Special/Veteran Rewards/Brazier.cs b/Scripts/Items/Special/Veteran Rewards/Brazier.cs index 4ae102ecc..e876690d7 100644 --- a/Scripts/Items/Special/Veteran Rewards/Brazier.cs +++ b/Scripts/Items/Special/Veteran Rewards/Brazier.cs @@ -130,7 +130,7 @@ namespace Server.Items public class RewardBrazierDeed : Item, IRewardItem { - public override int LabelNumber{ get{ return 1080527; } } // Brazier Deed + public override int LabelNumber => 1080527; // Brazier Deed private bool m_IsRewardItem; diff --git a/Scripts/Items/Special/Veteran Rewards/Cannon.cs b/Scripts/Items/Special/Veteran Rewards/Cannon.cs index bbd4f4546..6c5a58034 100644 --- a/Scripts/Items/Special/Veteran Rewards/Cannon.cs +++ b/Scripts/Items/Special/Veteran Rewards/Cannon.cs @@ -11,26 +11,26 @@ namespace Server.Items { public class CannonAddonComponent : AddonComponent { - public override int LabelNumber{ get{ return 1076157; } } // Decorative Cannon + public override int LabelNumber => 1076157; // Decorative Cannon public CannonAddonComponent( int itemID ) : base( itemID ) - { + { LootType = LootType.Blessed; } public CannonAddonComponent( Serial serial ) : base( serial ) { } - + public override void GetProperties( ObjectPropertyList list ) { base.GetProperties( list ); - + if ( Addon is CannonAddon ) { if ( ((CannonAddon) Addon).IsRewardItem ) list.Add( 1076223 ); // 7th Year Veteran Reward - + list.Add( 1076207, ((CannonAddon) Addon).Charges.ToString() ); // Remaining Charges: ~1_val~ } } @@ -51,7 +51,7 @@ namespace Server.Items } public class CannonAddon : BaseAddon - { + { public override BaseAddonDeed Deed { get @@ -60,31 +60,31 @@ namespace Server.Items deed.Charges = m_Charges; deed.IsRewardItem = m_IsRewardItem; - return deed; - } + return deed; + } } - + private CannonDirection m_CannonDirection; private int m_Charges; private bool m_IsRewardItem; [CommandProperty( AccessLevel.GameMaster )] public CannonDirection CannonDirection - { - get{ return m_CannonDirection; } + { + get{ return m_CannonDirection; } } - + [CommandProperty( AccessLevel.GameMaster )] - public int Charges - { - get{ return m_Charges; } + public int Charges + { + get{ return m_Charges; } set - { - m_Charges = value; - + { + m_Charges = value; + foreach ( AddonComponent c in Components ) - c.InvalidateProperties(); - } + c.InvalidateProperties(); + } } [CommandProperty( AccessLevel.GameMaster )] @@ -92,11 +92,11 @@ namespace Server.Items { get{ return m_IsRewardItem; } set - { - m_IsRewardItem = value; - + { + m_IsRewardItem = value; + foreach ( AddonComponent c in Components ) - c.InvalidateProperties(); + c.InvalidateProperties(); } } @@ -145,7 +145,7 @@ namespace Server.Items public CannonAddon( Serial serial ) : base( serial ) { } - + public override void OnComponentUsed( AddonComponent c, Mobile from ) { if ( from.InRange( Location, 2 ) ) @@ -159,7 +159,7 @@ namespace Server.Items if ( from.Backpack != null ) { PotionKeg keg = from.Backpack.FindItemByType( typeof( PotionKeg ) ) as PotionKeg; - + if ( Validate( keg ) > 0 ) from.SendGump( new InternalGump( this, keg ) ); else @@ -170,7 +170,7 @@ namespace Server.Items else from.SendLocalizedMessage( 1076766 ); // That is too far away. } - + public int Validate( PotionKeg keg ) { if ( keg != null && !keg.Deleted && keg.Held == 100 ) @@ -182,14 +182,14 @@ namespace Server.Items else if ( keg.Type == PotionEffect.ExplosionGreater ) return 15; } - + return 0; } - + public void Fill( Mobile from, PotionKeg keg ) { Charges = Validate( keg ); - + if ( Charges > 0 ) { keg.Delete(); @@ -198,7 +198,7 @@ namespace Server.Items else from.SendLocalizedMessage( 1076198 ); // You do not have a full keg of explosion potions needed to recharge the cannon. } - + private static int[] m_Effects = new int[] { 0x36B0, 0x3728, 0x3709, 0x36FE @@ -207,20 +207,20 @@ namespace Server.Items public void DoFireEffect( IPoint3D target ) { Map map = Map; - + if ( target == null || map == null ) return; - + Effects.PlaySound( target, map, Utility.RandomList( 0x11B, 0x11C, 0x11D ) ); Effects.SendLocationEffect( target, map, Utility.RandomList( m_Effects ), 16, 1 ); - + for ( int count = Utility.Random( 3 ); count > 0; count-- ) - { + { IPoint3D location = new Point3D( target.X + Utility.RandomMinMax( -1, 1 ), target.Y + Utility.RandomMinMax( -1, 1 ), target.Z ); int effect = Utility.RandomList( m_Effects ); Effects.SendLocationEffect( location, map, effect, 16, 1 ); } - + Charges -= 1; } @@ -245,7 +245,7 @@ namespace Server.Items m_Charges = reader.ReadInt(); m_IsRewardItem = reader.ReadBool(); } - + private class InternalTarget : Target { private CannonAddon m_Cannon; @@ -259,134 +259,134 @@ namespace Server.Items { if ( m_Cannon == null || m_Cannon.Deleted ) return; - + IPoint3D p = targeted as IPoint3D; - + if ( p == null ) return; - + if ( from.InLOS( new Point3D( p ) ) ) { if ( !Utility.InRange( new Point3D( p ), m_Cannon.Location, 2 ) ) { bool allow = false; - + int x = p.X - m_Cannon.X; int y = p.Y - m_Cannon.Y; - + switch ( m_Cannon.CannonDirection ) { case CannonDirection.North: if ( y < 0 && Math.Abs( x ) <= -y / 3 ) allow = true; - + break; case CannonDirection.East: if ( x > 0 && Math.Abs( y ) <= x / 3 ) allow = true; - + break; case CannonDirection.South: if ( y > 0 && Math.Abs( x ) <= y / 3 ) allow = true; - + break; case CannonDirection.West: if ( x < 0 && Math.Abs( y ) <= -x / 3 ) allow = true; - + break; } - + if ( allow && Utility.InRange( new Point3D( p ), m_Cannon.Location, 14 ) ) m_Cannon.DoFireEffect( p ); else - from.SendLocalizedMessage( 1076203 ); // Target out of range. + from.SendLocalizedMessage( 1076203 ); // Target out of range. } else from.SendLocalizedMessage( 1076215 ); // Cannon must be aimed farther away. } else - from.SendLocalizedMessage( 1049630 ); // You cannot see that target! + from.SendLocalizedMessage( 1049630 ); // You cannot see that target! } - + protected override void OnTargetOutOfRange( Mobile from, object targeted ) { from.SendLocalizedMessage( 1076203 ); // Target out of range. } } - + private class InternalGump : Gump { private CannonAddon m_Cannon; private PotionKeg m_Keg; - + private enum Buttons { Cancel, Recharge - } - + } + public InternalGump( CannonAddon cannon, PotionKeg keg ) : base( 50, 50 ) { m_Cannon = cannon; m_Keg = keg; - + Closable = true; Disposable = true; Dragable = true; Resizable = false; AddPage( 0 ); - + AddBackground( 0, 0, 291, 133, 0x13BE ); AddImageTiled( 5, 5, 280, 100, 0xA40 ); - + AddHtmlLocalized( 9, 9, 272, 100, 1076196, cannon.Validate( keg ).ToString(), 0x7FFF, false, false ); // You will need a full keg of explosion potions to recharge the cannon. Your keg will provide ~1_CHARGES~ charges. - + AddButton( 5, 107, 0xFB1, 0xFB2, (int) Buttons.Cancel, GumpButtonType.Reply, 0 ); AddHtmlLocalized( 40, 109, 100, 20, 1060051, 0x7FFF, false, false ); // CANCEL - + AddButton( 160, 107, 0xFB7, 0xFB8, (int) Buttons.Recharge, GumpButtonType.Reply, 0 ); AddHtmlLocalized( 195, 109, 120, 20, 1076197, 0x7FFF, false, false ); // Recharge } - + public override void OnResponse( NetState state, RelayInfo info ) - { + { if ( m_Cannon == null || m_Cannon.Deleted ) return; - + if ( info.ButtonID == (int) Buttons.Recharge ) m_Cannon.Fill( state.Mobile, m_Keg ); } } } - + public class CannonDeed : BaseAddonDeed, IRewardItem, IRewardOption { - public override int LabelNumber{ get{ return 1076195; } } // A deed for a cannon - + public override int LabelNumber => 1076195; // A deed for a cannon + public override BaseAddon Addon - { + { get { CannonAddon addon = new CannonAddon( m_Direction ); addon.Charges = m_Charges; addon.IsRewardItem = m_IsRewardItem; - return addon; - } + return addon; + } } private CannonDirection m_Direction; private int m_Charges; private bool m_IsRewardItem; - + [CommandProperty( AccessLevel.GameMaster )] - public int Charges - { - get{ return m_Charges; } - set{ m_Charges = value; InvalidateProperties(); } + public int Charges + { + get{ return m_Charges; } + set{ m_Charges = value; InvalidateProperties(); } } [CommandProperty( AccessLevel.GameMaster )] @@ -395,39 +395,39 @@ namespace Server.Items get{ return m_IsRewardItem; } set{ m_IsRewardItem = value; InvalidateProperties(); } } - + [Constructible] - public CannonDeed() : base() - { + public CannonDeed() + { LootType = LootType.Blessed; } public CannonDeed( Serial serial ) : base( serial ) { } - + public override void GetProperties( ObjectPropertyList list ) { - base.GetProperties( list ); - + base.GetProperties( list ); + if ( m_IsRewardItem ) list.Add( 1076223 ); // 7th Year Veteran Reward - + list.Add( 1076207, m_Charges.ToString() ); // Remaining Charges: ~1_val~ } - + public override void OnDoubleClick( Mobile from ) - { + { if ( m_IsRewardItem && !RewardSystem.CheckIsUsableBy( from, this, null ) ) return; - + if ( IsChildOf( from.Backpack ) ) { from.CloseGump( typeof( RewardOptionGump ) ); from.SendGump( new RewardOptionGump( this ) ); } else - from.SendLocalizedMessage( 1042038 ); // You must have the object in your backpack to use it. + from.SendLocalizedMessage( 1042038 ); // You must have the object in your backpack to use it. } public override void Serialize( GenericWriter writer ) @@ -435,17 +435,17 @@ namespace Server.Items base.Serialize( writer ); writer.WriteEncodedInt( 0 ); // version - + writer.Write( (int) m_Charges ); writer.Write( (bool) m_IsRewardItem ); } - + public override void Deserialize( GenericReader reader ) { base.Deserialize( reader ); int version = reader.ReadEncodedInt(); - + m_Charges = reader.ReadInt(); m_IsRewardItem = reader.ReadBool(); } diff --git a/Scripts/Items/Special/Veteran Rewards/CommodityDeedBox.cs b/Scripts/Items/Special/Veteran Rewards/CommodityDeedBox.cs index 465cb2fe2..8d6ebbc95 100644 --- a/Scripts/Items/Special/Veteran Rewards/CommodityDeedBox.cs +++ b/Scripts/Items/Special/Veteran Rewards/CommodityDeedBox.cs @@ -3,12 +3,12 @@ using Server; using Server.Engines.VeteranRewards; namespace Server.Items -{ +{ [Furniture] public class CommodityDeedBox : BaseContainer, IRewardItem { - public override int LabelNumber{ get { return 1080523; } } // Commodity Deed Box - public override int DefaultGumpID{ get{ return 0x43; } } + public override int LabelNumber => 1080523; // Commodity Deed Box + public override int DefaultGumpID => 0x43; private bool m_IsRewardItem; @@ -29,13 +29,13 @@ namespace Server.Items public CommodityDeedBox( Serial serial ) : base( serial ) { } - + public override void GetProperties( ObjectPropertyList list ) { base.GetProperties( list ); - + if ( m_IsRewardItem ) - list.Add( 1076217 ); // 1st Year Veteran Reward + list.Add( 1076217 ); // 1st Year Veteran Reward } public override void Serialize( GenericWriter writer ) @@ -46,7 +46,7 @@ namespace Server.Items writer.Write( (bool) m_IsRewardItem ); } - + public override void Deserialize( GenericReader reader ) { base.Deserialize( reader ); @@ -65,5 +65,5 @@ namespace Server.Items return parent as CommodityDeedBox; } - } + } } diff --git a/Scripts/Items/Special/Veteran Rewards/DecorativeShield.cs b/Scripts/Items/Special/Veteran Rewards/DecorativeShield.cs index 349e7b72f..47b2b2a06 100644 --- a/Scripts/Items/Special/Veteran Rewards/DecorativeShield.cs +++ b/Scripts/Items/Special/Veteran Rewards/DecorativeShield.cs @@ -116,7 +116,7 @@ namespace Server.Items public class DecorativeShieldDeed : Item, IRewardItem { - public override int LabelNumber{ get{ return 1049771; } } // deed for a decorative shield wall hanging + public override int LabelNumber => 1049771; // deed for a decorative shield wall hanging private bool m_IsRewardItem; diff --git a/Scripts/Items/Special/Veteran Rewards/FlamingHead.cs b/Scripts/Items/Special/Veteran Rewards/FlamingHead.cs index 048316c34..54c8cf86f 100644 --- a/Scripts/Items/Special/Veteran Rewards/FlamingHead.cs +++ b/Scripts/Items/Special/Veteran Rewards/FlamingHead.cs @@ -10,7 +10,7 @@ namespace Server.Items { public class FlamingHead : StoneFaceTrapNoDamage, IAddon, IRewardItem { - public override int LabelNumber{ get{ return 1041266; } } // Flaming Head + public override int LabelNumber => 1041266; // Flaming Head public override bool ForceShowProperties => ObjectPropertyList.Enabled; public Item Deed @@ -39,7 +39,7 @@ namespace Server.Items } [Constructible] - public FlamingHead( StoneFaceTrapType type ) : base() + public FlamingHead( StoneFaceTrapType type ) { LootType = LootType.Blessed; Movable = false; @@ -112,7 +112,7 @@ namespace Server.Items public class FlamingHeadDeed : Item, IRewardItem { - public override int LabelNumber{ get{ return 1041050; } } // a flaming head deed + public override int LabelNumber => 1041050; // a flaming head deed private bool m_IsRewardItem; diff --git a/Scripts/Items/Special/Veteran Rewards/HangingSkeleton.cs b/Scripts/Items/Special/Veteran Rewards/HangingSkeleton.cs index a1a4d381f..7c0ede5a3 100644 --- a/Scripts/Items/Special/Veteran Rewards/HangingSkeleton.cs +++ b/Scripts/Items/Special/Veteran Rewards/HangingSkeleton.cs @@ -118,7 +118,7 @@ namespace Server.Items public class HangingSkeletonDeed : Item, IRewardItem { - public override int LabelNumber{ get{ return 1049772; } } // deed for a hanging skeleton decoration + public override int LabelNumber => 1049772; // deed for a hanging skeleton decoration private bool m_IsRewardItem; diff --git a/Scripts/Items/Special/Veteran Rewards/MiningCart.cs b/Scripts/Items/Special/Veteran Rewards/MiningCart.cs index 559f05087..f7044dbc6 100644 --- a/Scripts/Items/Special/Veteran Rewards/MiningCart.cs +++ b/Scripts/Items/Special/Veteran Rewards/MiningCart.cs @@ -67,7 +67,7 @@ namespace Server.Items private Timer m_Timer; [Constructible] - public MiningCart( MiningCartType type ) : base() + public MiningCart( MiningCartType type ) { m_CartType = type; @@ -305,7 +305,7 @@ namespace Server.Items public class MiningCartDeed : BaseAddonDeed, IRewardItem, IRewardOption { - public override int LabelNumber{ get{ return 1080385; } } // deed for a mining cart decoration + public override int LabelNumber => 1080385; // deed for a mining cart decoration public override BaseAddon Addon { @@ -350,7 +350,7 @@ namespace Server.Items } [Constructible] - public MiningCartDeed() : base() + public MiningCartDeed() { LootType = LootType.Blessed; } @@ -419,4 +419,4 @@ namespace Server.Items base.OnDoubleClick( from ); } } -} \ No newline at end of file +} diff --git a/Scripts/Items/Special/Veteran Rewards/MinotaurStatue.cs b/Scripts/Items/Special/Veteran Rewards/MinotaurStatue.cs index d9cdadc3d..30cfa5d11 100644 --- a/Scripts/Items/Special/Veteran Rewards/MinotaurStatue.cs +++ b/Scripts/Items/Special/Veteran Rewards/MinotaurStatue.cs @@ -23,7 +23,7 @@ namespace Server.Items MinotaurStatueDeed deed = new MinotaurStatueDeed(); deed.IsRewardItem = m_IsRewardItem; - return deed; + return deed; } } @@ -37,7 +37,7 @@ namespace Server.Items } [Constructible] - public MinotaurStatue( MinotaurStatueType type ) : base() + public MinotaurStatue( MinotaurStatueType type ) { switch ( type ) { @@ -72,7 +72,7 @@ namespace Server.Items base.Serialize( writer ); writer.WriteEncodedInt( 0 ); // version - + writer.Write( (bool) m_IsRewardItem ); } @@ -81,26 +81,26 @@ namespace Server.Items base.Deserialize( reader ); int version = reader.ReadEncodedInt(); - + m_IsRewardItem = reader.ReadBool(); } - } - + } + public class MinotaurStatueDeed : BaseAddonDeed, IRewardItem, IRewardOption { - public override int LabelNumber{ get{ return 1080409; } } // Minotaur Statue Deed + public override int LabelNumber => 1080409; // Minotaur Statue Deed public override BaseAddon Addon - { + { get - { + { MinotaurStatue addon = new MinotaurStatue( m_StatueType ); addon.IsRewardItem = m_IsRewardItem; - return addon; - } + return addon; + } } - + private MinotaurStatueType m_StatueType; private bool m_IsRewardItem; @@ -112,7 +112,7 @@ namespace Server.Items } [Constructible] - public MinotaurStatueDeed() : base() + public MinotaurStatueDeed() { LootType = LootType.Blessed; } @@ -120,25 +120,25 @@ namespace Server.Items public MinotaurStatueDeed( Serial serial ) : base( serial ) { } - + public override void OnDoubleClick( Mobile from ) { if ( m_IsRewardItem && !RewardSystem.CheckIsUsableBy( from, this, null ) ) return; - + if ( IsChildOf( from.Backpack ) ) { from.CloseGump( typeof( RewardOptionGump ) ); from.SendGump( new RewardOptionGump( this ) ); } else - from.SendLocalizedMessage( 1062334 ); // This item must be in your backpack to be used. + from.SendLocalizedMessage( 1062334 ); // This item must be in your backpack to be used. } public override void GetProperties( ObjectPropertyList list ) { base.GetProperties( list ); - + if ( m_IsRewardItem ) list.Add( 1076218 ); // 2nd Year Veteran Reward } @@ -157,7 +157,7 @@ namespace Server.Items base.Deserialize( reader ); int version = reader.ReadEncodedInt(); - + m_IsRewardItem = reader.ReadBool(); } diff --git a/Scripts/Items/Special/Veteran Rewards/PottedCactus.cs b/Scripts/Items/Special/Veteran Rewards/PottedCactus.cs index 73f4fc9b2..560edcfe9 100644 --- a/Scripts/Items/Special/Veteran Rewards/PottedCactus.cs +++ b/Scripts/Items/Special/Veteran Rewards/PottedCactus.cs @@ -8,7 +8,7 @@ namespace Server.Items { public class RewardPottedCactus : Item, IRewardItem { - public override bool ForceShowProperties{ get { return ObjectPropertyList.Enabled; } } + public override bool ForceShowProperties => ObjectPropertyList.Enabled; private bool m_IsRewardItem; @@ -21,12 +21,12 @@ namespace Server.Items [Constructible] public RewardPottedCactus() : this( Utility.RandomMinMax( 0x1E0F, 0x1E14 ) ) - { + { } [Constructible] public RewardPottedCactus( int itemID ) : base( itemID ) - { + { Weight = 5.0; } @@ -55,13 +55,13 @@ namespace Server.Items m_IsRewardItem = reader.ReadBool(); break; } - + } - } - + } + public class PottedCactusDeed : Item, IRewardItem { - public override int LabelNumber{ get{ return 1080407; } } // Potted Cactus Deed + public override int LabelNumber => 1080407; // Potted Cactus Deed private bool m_IsRewardItem; @@ -96,7 +96,7 @@ namespace Server.Items else from.SendLocalizedMessage( 1042038 ); // You must have the object in your backpack to use it. } - + public override void GetProperties( ObjectPropertyList list ) { @@ -120,14 +120,14 @@ namespace Server.Items base.Deserialize( reader ); int version = reader.ReadEncodedInt(); - + m_IsRewardItem = reader.ReadBool(); } private class InternalGump : Gump - { + { private PottedCactusDeed m_Cactus; - + public InternalGump( PottedCactusDeed cactus ) : base( 100, 200 ) { m_Cactus = cactus; @@ -145,30 +145,30 @@ namespace Server.Items AddItem( 45, 75, 0x1E0F ); AddButton( 55, 50, 0x845, 0x846, 0x1E0F, GumpButtonType.Reply, 0 ); - + AddItem( 105, 75, 0x1E10 ); AddButton( 115, 50, 0x845, 0x846, 0x1E10, GumpButtonType.Reply, 0 ); AddItem( 160, 75, 0x1E14 ); AddButton( 175, 50, 0x845, 0x846, 0x1E14, GumpButtonType.Reply, 0 ); - + AddItem( 220, 75, 0x1E11 ); AddButton( 235, 50, 0x845, 0x846, 0x1E11, GumpButtonType.Reply, 0 ); - + AddItem( 280, 75, 0x1E12 ); AddButton( 295, 50, 0x845, 0x846, 0x1E12, GumpButtonType.Reply, 0 ); AddItem( 340, 75, 0x1E13 ); AddButton( 355, 50, 0x845, 0x846, 0x1E13, GumpButtonType.Reply, 0 ); } - + public override void OnResponse( NetState sender, RelayInfo info ) { if ( m_Cactus == null | m_Cactus.Deleted ) - return; - - Mobile m = sender.Mobile; - + return; + + Mobile m = sender.Mobile; + if ( info.ButtonID >= 0x1E0F && info.ButtonID <= 0x1E14 ) { RewardPottedCactus cactus = new RewardPottedCactus( info.ButtonID ); diff --git a/Scripts/Items/Special/Veteran Rewards/StoneAnkh.cs b/Scripts/Items/Special/Veteran Rewards/StoneAnkh.cs index 1a7f6d77d..1c949e660 100644 --- a/Scripts/Items/Special/Veteran Rewards/StoneAnkh.cs +++ b/Scripts/Items/Special/Veteran Rewards/StoneAnkh.cs @@ -71,7 +71,7 @@ namespace Server.Items } [Constructible] - public StoneAnkh( bool east ) : base() + public StoneAnkh( bool east ) { if ( east ) { @@ -142,7 +142,7 @@ namespace Server.Items public class StoneAnkhDeed : BaseAddonDeed, IRewardItem { - public override int LabelNumber{ get{ return 1049773; } } // deed for a stone ankh + public override int LabelNumber => 1049773; // deed for a stone ankh private bool m_East; private bool m_IsRewardItem; @@ -166,7 +166,7 @@ namespace Server.Items } [Constructible] - public StoneAnkhDeed() : base() + public StoneAnkhDeed() { LootType = LootType.Blessed; } diff --git a/Scripts/Items/Special/Veteran Rewards/TreeStump.cs b/Scripts/Items/Special/Veteran Rewards/TreeStump.cs index ac451e609..bdfc34046 100644 --- a/Scripts/Items/Special/Veteran Rewards/TreeStump.cs +++ b/Scripts/Items/Special/Veteran Rewards/TreeStump.cs @@ -41,7 +41,7 @@ namespace Server.Items private Timer m_Timer; [Constructible] - public TreeStump( int itemID ) : base() + public TreeStump( int itemID ) { AddComponent( new AddonComponent( itemID ), 0, 0, 0 ); @@ -157,7 +157,7 @@ namespace Server.Items public class TreeStumpDeed : BaseAddonDeed, IRewardItem, IRewardOption { - public override int LabelNumber{ get{ return 1080406; } } // a deed for a tree stump decoration + public override int LabelNumber => 1080406; // a deed for a tree stump decoration public override BaseAddon Addon { @@ -191,7 +191,7 @@ namespace Server.Items } [Constructible] - public TreeStumpDeed() : base() + public TreeStumpDeed() { LootType = LootType.Blessed; } @@ -264,4 +264,4 @@ namespace Server.Items base.OnDoubleClick( from ); } } -} \ No newline at end of file +} diff --git a/Scripts/Items/Special/Veteran Rewards/WallBanner.cs b/Scripts/Items/Special/Veteran Rewards/WallBanner.cs index c65a454dd..8f200f3d0 100644 --- a/Scripts/Items/Special/Veteran Rewards/WallBanner.cs +++ b/Scripts/Items/Special/Veteran Rewards/WallBanner.cs @@ -11,9 +11,9 @@ namespace Server.Items public class WallBannerComponent : AddonComponent, IDyable { public override bool NeedsWall => true; - public override Point3D WallPosition{ get{ return this.East ? new Point3D( -1, 0, 0 ) : new Point3D( 0, -1, 0 ); } } + public override Point3D WallPosition => this.East ? new Point3D( -1, 0, 0 ) : new Point3D( 0, -1, 0 ); - public bool East{ get { return ((WallBanner)Addon).East; } } + public bool East => ((WallBanner)Addon).East; public WallBannerComponent( int itemID ) : base( itemID ) { @@ -81,7 +81,7 @@ namespace Server.Items } [Constructible] - public WallBanner( int bannerID ) : base() + public WallBanner( int bannerID ) { m_East = ((bannerID % 2) == 1 ); @@ -261,7 +261,7 @@ namespace Server.Items public class WallBannerDeed : BaseAddonDeed, IRewardItem { - public override int LabelNumber{ get{ return 1080549; } } // Wall Banner Deed + public override int LabelNumber => 1080549; // Wall Banner Deed public override BaseAddon Addon { @@ -285,7 +285,7 @@ namespace Server.Items } [Constructible] - public WallBannerDeed() : base() + public WallBannerDeed() { LootType = LootType.Blessed; } diff --git a/Scripts/Items/Special/Veteran Rewards/WeaponEngravingTool.cs b/Scripts/Items/Special/Veteran Rewards/WeaponEngravingTool.cs index 1d2cba10d..6cdfe2a7c 100644 --- a/Scripts/Items/Special/Veteran Rewards/WeaponEngravingTool.cs +++ b/Scripts/Items/Special/Veteran Rewards/WeaponEngravingTool.cs @@ -8,9 +8,9 @@ using Server.Engines.VeteranRewards; namespace Server.Items { public class WeaponEngravingTool : Item, IUsesRemaining, IRewardItem - { - public override int LabelNumber{ get{ return 1076158; } } // Weapon Engraving Tool - + { + public override int LabelNumber => 1076158; // Weapon Engraving Tool + private int m_UsesRemaining; private bool m_IsRewardItem; @@ -20,12 +20,12 @@ namespace Server.Items get{ return m_UsesRemaining; } set{ m_UsesRemaining = value; InvalidateProperties(); } } - + public virtual bool ShowUsesRemaining - { - get{ return true; } + { + get{ return true; } set{} - } + } [CommandProperty( AccessLevel.GameMaster )] public bool IsRewardItem @@ -33,76 +33,76 @@ namespace Server.Items get{ return m_IsRewardItem; } set{ m_IsRewardItem = value; InvalidateProperties(); } } - + [Constructible] public WeaponEngravingTool() : this( 10 ) { } - + [Constructible] public WeaponEngravingTool( int uses ) : base( 0x32F8 ) { LootType = LootType.Blessed; Weight = 1.0; - + m_UsesRemaining = uses; } public WeaponEngravingTool( Serial serial ) : base( serial ) { } - + public override void OnDoubleClick( Mobile from ) { if ( m_IsRewardItem && !RewardSystem.CheckIsUsableBy( from, this, null ) ) return; - + if ( m_UsesRemaining > 0 ) { from.SendLocalizedMessage( 1072357 ); // Select an object to engrave. from.Target = new TargetWeapon( this ); } - else + else { if ( from.Skills.Tinkering.Value == 0 ) { - from.SendLocalizedMessage( 1076179 ); // Since you have no tinkering skill, you will need to find an NPC tinkerer to repair this for you. + from.SendLocalizedMessage( 1076179 ); // Since you have no tinkering skill, you will need to find an NPC tinkerer to repair this for you. } else if ( from.Skills.Tinkering.Value < 75.0 ) - { + { from.SendLocalizedMessage( 1076178 ); // Your tinkering skill is too low to fix this yourself. An NPC tinkerer can help you repair this for a fee. } else - { - Item diamond = from.Backpack.FindItemByType( typeof( BlueDiamond ) ); - + { + Item diamond = from.Backpack.FindItemByType( typeof( BlueDiamond ) ); + if ( diamond != null ) - from.SendGump( new ConfirmGump( this, null ) ); - else - from.SendLocalizedMessage( 1076166 ); // You do not have a blue diamond needed to recharge the engraving tool. + from.SendGump( new ConfirmGump( this, null ) ); + else + from.SendLocalizedMessage( 1076166 ); // You do not have a blue diamond needed to recharge the engraving tool. } - + from.SendLocalizedMessage( 1076163 ); // There are no charges left on this engraving tool. - } + } } - + public override void GetProperties( ObjectPropertyList list ) { base.GetProperties( list ); - + if ( m_IsRewardItem ) list.Add( 1076224 ); // 8th Year Veteran Reward - + if ( ShowUsesRemaining ) - list.Add( 1060584, m_UsesRemaining.ToString() ); // uses remaining: ~1_val~ + list.Add( 1060584, m_UsesRemaining.ToString() ); // uses remaining: ~1_val~ } public override void Serialize( GenericWriter writer ) { base.Serialize( writer ); - + writer.Write( (int) 0 ); // version - + writer.Write( (int) m_UsesRemaining ); writer.Write( (bool) m_IsRewardItem ); } @@ -110,27 +110,27 @@ namespace Server.Items public override void Deserialize( GenericReader reader ) { base.Deserialize( reader ); - + int version = reader.ReadInt(); - + m_UsesRemaining = reader.ReadInt(); m_IsRewardItem = reader.ReadBool(); } - + public virtual void Recharge( Mobile from, Mobile guildmaster ) - { + { if ( from.Backpack != null ) { - Item diamond = from.Backpack.FindItemByType( typeof( BlueDiamond ) ); - + Item diamond = from.Backpack.FindItemByType( typeof( BlueDiamond ) ); + if ( guildmaster != null ) { if ( m_UsesRemaining <= 0 ) - { + { if ( diamond != null && Banker.Withdraw( from, 100000 ) ) - { + { diamond.Consume(); - UsesRemaining = 10; + UsesRemaining = 10; guildmaster.Say( 1076165 ); // Your weapon engraver should be good as new! } else @@ -140,59 +140,59 @@ namespace Server.Items guildmaster.Say( 1076164 ); // I can only help with this if you are carrying an engraving tool that needs repair. } else - { + { if ( from.Skills.Tinkering.Value == 0 ) { - from.SendLocalizedMessage( 1076179 ); // Since you have no tinkering skill, you will need to find an NPC tinkerer to repair this for you. + from.SendLocalizedMessage( 1076179 ); // Since you have no tinkering skill, you will need to find an NPC tinkerer to repair this for you. } else if ( from.Skills.Tinkering.Value < 75.0 ) - { + { from.SendLocalizedMessage( 1076178 ); // Your tinkering skill is too low to fix this yourself. An NPC tinkerer can help you repair this for a fee. } else if ( diamond != null ) { diamond.Consume(); - + if ( Utility.RandomDouble() < from.Skills.Tinkering.Value / 100 ) - { - UsesRemaining = 10; + { + UsesRemaining = 10; from.SendLocalizedMessage( 1076165 ); // Your weapon engraver should be good as new! ????? } else from.SendLocalizedMessage( 1076175 ); // You cracked the diamond attempting to fix the weapon engraver. } else - from.SendLocalizedMessage( 1076166 ); // You do not have a blue diamond needed to recharge the engraving tool. - } - } + from.SendLocalizedMessage( 1076166 ); // You do not have a blue diamond needed to recharge the engraving tool. + } + } } - + public static WeaponEngravingTool Find( Mobile from ) { if ( from.Backpack != null ) return from.Backpack.FindItemByType( typeof( WeaponEngravingTool ) ) as WeaponEngravingTool; - + return null; } - + private class TargetWeapon : Target { private WeaponEngravingTool m_Tool; - + public TargetWeapon( WeaponEngravingTool tool ) : base( -1, true, TargetFlags.None ) { m_Tool = tool; } - + protected override void OnTarget( Mobile from, object targeted ) { if ( m_Tool == null || m_Tool.Deleted ) return; - + if ( targeted is BaseWeapon ) { BaseWeapon item = (BaseWeapon) targeted; - + from.CloseGump( typeof( InternalGump ) ); from.SendGump( new InternalGump( m_Tool, item ) ); } @@ -200,29 +200,29 @@ namespace Server.Items from.SendLocalizedMessage( 1072309 ); // The selected item cannot be engraved by this engraving tool. } } - + private class InternalGump : Gump { private WeaponEngravingTool m_Tool; private BaseWeapon m_Target; - + private enum Buttons { Cancel, Okay, Text } - + public InternalGump( WeaponEngravingTool tool, BaseWeapon target ) : base( 0, 0 ) { m_Tool = tool; m_Target = target; - + Closable = true; Disposable = true; Dragable = true; Resizable = false; - + AddBackground( 50, 50, 400, 300, 0xA28 ); AddPage( 0 ); @@ -236,19 +236,19 @@ namespace Server.Items AddImageTiled( 75, 245, 2, 40, 0x23C3 ); AddImageTiled( 75, 285, 350, 2, 0x23C5 ); AddImageTiled( 425, 245, 2, 42, 0x23C3 ); - + AddTextEntry( 75, 245, 350, 40, 0x0, (int) Buttons.Text, "" ); } - + public override void OnResponse( Server.Network.NetState state, RelayInfo info ) - { + { if ( m_Tool == null || m_Tool.Deleted || m_Target == null || m_Target.Deleted ) return; - + if ( info.ButtonID == (int) Buttons.Okay ) { TextRelay relay = info.GetTextEntry( (int) Buttons.Text ); - + if ( relay != null ) { if ( String.IsNullOrEmpty( relay.Text ) ) @@ -262,9 +262,9 @@ namespace Server.Items m_Target.EngravedText = Utility.FixHtml( relay.Text.Substring( 0, 64 ) ); else m_Target.EngravedText = Utility.FixHtml( relay.Text ); - - state.Mobile.SendLocalizedMessage( 1072361 ); // You engraved the object. - m_Target.InvalidateProperties(); + + state.Mobile.SendLocalizedMessage( 1072361 ); // You engraved the object. + m_Target.InvalidateProperties(); m_Tool.UsesRemaining -= 1; m_Tool.InvalidateProperties(); } @@ -274,33 +274,33 @@ namespace Server.Items state.Mobile.SendLocalizedMessage( 1072363 ); // The object was not engraved. } } - + public class ConfirmGump : Gump - { + { private WeaponEngravingTool m_Engraver; private Mobile m_Guildmaster; - + private enum Buttons { Cancel, Confirm } - + public ConfirmGump( WeaponEngravingTool engraver, Mobile guildmaster ) : base( 200, 200 ) - { + { m_Engraver = engraver; m_Guildmaster = guildmaster; - + Closable = false; Disposable = true; Dragable = true; Resizable = false; - + AddPage( 0 ); AddBackground( 0, 0, 291, 133, 0x13BE ); AddImageTiled( 5, 5, 280, 100, 0xA40 ); - + if ( guildmaster != null ) { AddHtmlLocalized( 9, 9, 272, 100, 1076169, 0x7FFF, false, false ); // It will cost you 100,000 gold and a blue diamond to recharge your weapon engraver with 10 charges. @@ -311,20 +311,20 @@ namespace Server.Items AddHtmlLocalized( 9, 9, 272, 100, 1076176, 0x7FFF, false, false ); // You will need a blue diamond to repair the tip of the engraver. A successful repair will give the engraver 10 charges. AddHtmlLocalized( 195, 109, 120, 20, 1076177, 0x7FFF, false, false ); // Replace the tip. } - - AddButton( 160, 107, 0xFB7, 0xFB8, (int) Buttons.Confirm, GumpButtonType.Reply, 0 ); + + AddButton( 160, 107, 0xFB7, 0xFB8, (int) Buttons.Confirm, GumpButtonType.Reply, 0 ); AddButton( 5, 107, 0xFB1, 0xFB2, (int) Buttons.Cancel, GumpButtonType.Reply, 0 ); AddHtmlLocalized( 40, 109, 100, 20, 1060051, 0x7FFF, false, false ); // CANCEL } - + public override void OnResponse( Server.Network.NetState state, RelayInfo info ) - { + { if ( m_Engraver == null || m_Engraver.Deleted ) return; - + if ( info.ButtonID == (int) Buttons.Confirm ) m_Engraver.Recharge( state.Mobile, m_Guildmaster ); } } } -} +} diff --git a/Scripts/Items/Talismans/BaseTalisman.cs b/Scripts/Items/Talismans/BaseTalisman.cs index 902307f24..ad593cd7e 100644 --- a/Scripts/Items/Talismans/BaseTalisman.cs +++ b/Scripts/Items/Talismans/BaseTalisman.cs @@ -39,8 +39,8 @@ namespace Server.Items } } - public override int LabelNumber { get { return 1071023; } } // Talisman - public virtual bool ForceShowName { get { return false; } } // used to override default summoner/removal name + public override int LabelNumber => 1071023; // Talisman + public virtual bool ForceShowName => false; // used to override default summoner/removal name private int m_MaxCharges; private int m_Charges; diff --git a/Scripts/Items/Talismans/Items/EnchantedSwitch.cs b/Scripts/Items/Talismans/Items/EnchantedSwitch.cs index daa217840..9f462003e 100644 --- a/Scripts/Items/Talismans/Items/EnchantedSwitch.cs +++ b/Scripts/Items/Talismans/Items/EnchantedSwitch.cs @@ -4,7 +4,7 @@ namespace Server.Items { public class EnchantedSwitch : Item { - public override int LabelNumber{ get{ return 1072893; } } // enchanted switch + public override int LabelNumber => 1072893; // enchanted switch [Constructible] public EnchantedSwitch() : base( 0x2F5C ) diff --git a/Scripts/Items/Talismans/Items/HollowPrism.cs b/Scripts/Items/Talismans/Items/HollowPrism.cs index 9808a85d9..1409f622d 100644 --- a/Scripts/Items/Talismans/Items/HollowPrism.cs +++ b/Scripts/Items/Talismans/Items/HollowPrism.cs @@ -4,8 +4,8 @@ namespace Server.Items { public class HollowPrism : Item { - public override int LabelNumber{ get{ return 1072895; } } // hollow prism - + public override int LabelNumber => 1072895; // hollow prism + [Constructible] public HollowPrism() : base( 0x2F5D ) { diff --git a/Scripts/Items/Talismans/Items/JeweledFiligree.cs b/Scripts/Items/Talismans/Items/JeweledFiligree.cs index d20c2f208..bded69e4d 100644 --- a/Scripts/Items/Talismans/Items/JeweledFiligree.cs +++ b/Scripts/Items/Talismans/Items/JeweledFiligree.cs @@ -4,7 +4,7 @@ namespace Server.Items { public class JeweledFiligree : Item { - public override int LabelNumber{ get{ return 1072894; } } // jeweled filigree + public override int LabelNumber => 1072894; // jeweled filigree [Constructible] public JeweledFiligree() : base( 0x2F5E ) diff --git a/Scripts/Items/Talismans/Items/RunedPrism.cs b/Scripts/Items/Talismans/Items/RunedPrism.cs index 5a72ed259..deae46884 100644 --- a/Scripts/Items/Talismans/Items/RunedPrism.cs +++ b/Scripts/Items/Talismans/Items/RunedPrism.cs @@ -4,7 +4,7 @@ namespace Server.Items { public class RunedPrism : Item { - public override int LabelNumber{ get{ return 1073465; } } // runed prism + public override int LabelNumber => 1073465; // runed prism [Constructible] public RunedPrism() : base( 0x2F57 ) diff --git a/Scripts/Items/Talismans/Items/RunedSwitch.cs b/Scripts/Items/Talismans/Items/RunedSwitch.cs index 6fae82d11..524527587 100644 --- a/Scripts/Items/Talismans/Items/RunedSwitch.cs +++ b/Scripts/Items/Talismans/Items/RunedSwitch.cs @@ -6,7 +6,7 @@ namespace Server.Items { public class RunedSwitch : Item { - public override int LabelNumber{ get{ return 1072896; } } // runed switch + public override int LabelNumber => 1072896; // runed switch [Constructible] public RunedSwitch() : base( 0x2F61 ) @@ -42,7 +42,7 @@ namespace Server.Items int version = reader.ReadInt(); } - + private class InternalTarget : Target { private RunedSwitch m_Item; diff --git a/Scripts/Items/Talismans/TalismanSummons.cs b/Scripts/Items/Talismans/TalismanSummons.cs index 14eb91a35..8959b8d75 100644 --- a/Scripts/Items/Talismans/TalismanSummons.cs +++ b/Scripts/Items/Talismans/TalismanSummons.cs @@ -68,7 +68,7 @@ namespace Server.Mobiles public override string DefaultName => "an ant lion"; [Constructible] - public SummonedAntLion() : base() + public SummonedAntLion() { Body = 787; BaseSoundID = 1006; @@ -128,7 +128,7 @@ namespace Server.Mobiles public override string DefaultName => "a bake kitsune"; [Constructible] - public SummonedBakeKitsune() : base() + public SummonedBakeKitsune() { Body = 246; BaseSoundID = 0x4DD; @@ -158,7 +158,7 @@ namespace Server.Mobiles public override string DefaultName => "a bogling"; [Constructible] - public SummonedBogling() : base() + public SummonedBogling() { Body = 779; BaseSoundID = 422; @@ -188,7 +188,7 @@ namespace Server.Mobiles public override string DefaultName => "a bull frog"; [Constructible] - public SummonedBullFrog() : base() + public SummonedBullFrog() { Body = 81; Hue = Utility.RandomList( 0x5AC, 0x5A3, 0x59A, 0x591, 0x588, 0x57F ); @@ -219,7 +219,7 @@ namespace Server.Mobiles public override string DefaultName => "a chicken"; [Constructible] - public SummonedChicken() : base() + public SummonedChicken() { Body = 0xD0; BaseSoundID = 0x6E; @@ -249,7 +249,7 @@ namespace Server.Mobiles public override string DefaultName => "a cow"; [Constructible] - public SummonedCow() : base() + public SummonedCow() { Body = Utility.RandomList( 0xD8, 0xE7 ); BaseSoundID = 0x78; @@ -278,7 +278,7 @@ namespace Server.Mobiles public override string DefaultName => "a doppleganger"; [Constructible] - public SummonedDoppleganger() : base() + public SummonedDoppleganger() { Body = 0x309; BaseSoundID = 0x451; @@ -308,7 +308,7 @@ namespace Server.Mobiles public override string DefaultName => "a frost spider"; [Constructible] - public SummonedFrostSpider() : base() + public SummonedFrostSpider() { Body = 20; BaseSoundID = 0x388; @@ -338,7 +338,7 @@ namespace Server.Mobiles public override string DefaultName => "a great hart"; [Constructible] - public SummonedGreatHart() : base() + public SummonedGreatHart() { Body = 0xEA; BaseSoundID = 0x82; @@ -368,7 +368,7 @@ namespace Server.Mobiles public override string DefaultName => "a lava serpent"; [Constructible] - public SummonedLavaSerpent() : base() + public SummonedLavaSerpent() { Body = 90; BaseSoundID = 219; @@ -442,7 +442,7 @@ namespace Server.Mobiles public override string DefaultName => "an orc brute"; [Constructible] - public SummonedOrcBrute() : base() + public SummonedOrcBrute() { Body = 189; BaseSoundID = 0x45A; @@ -472,7 +472,7 @@ namespace Server.Mobiles public override string DefaultName => "a panther"; [Constructible] - public SummonedPanther() : base() + public SummonedPanther() { Body = 0xD6; Hue = 0x901; @@ -503,7 +503,7 @@ namespace Server.Mobiles public override string DefaultName => "a sheep"; [Constructible] - public SummonedSheep() : base() + public SummonedSheep() { Body = 0xCF; BaseSoundID = 0xD6; @@ -534,7 +534,7 @@ namespace Server.Mobiles public override string DefaultName => "a skeletal knight"; [Constructible] - public SummonedSkeletalKnight() : base() + public SummonedSkeletalKnight() { Body = 147; BaseSoundID = 451; @@ -564,7 +564,7 @@ namespace Server.Mobiles public override string DefaultName => "a vorpal bunny"; [Constructible] - public SummonedVorpalBunny() : base() + public SummonedVorpalBunny() { Body = 205; Hue = 0x480; @@ -611,7 +611,7 @@ namespace Server.Mobiles public override string DefaultName => "a wailing banshee"; [Constructible] - public SummonedWailingBanshee() : base() + public SummonedWailingBanshee() { Body = 310; BaseSoundID = 0x482; diff --git a/Scripts/Items/Traps/FireColumnTrap.cs b/Scripts/Items/Traps/FireColumnTrap.cs index 3490ba06c..bea33b582 100644 --- a/Scripts/Items/Traps/FireColumnTrap.cs +++ b/Scripts/Items/Traps/FireColumnTrap.cs @@ -14,9 +14,9 @@ namespace Server.Items } public override bool PassivelyTriggered => true; - public override TimeSpan PassiveTriggerDelay{ get{ return TimeSpan.FromSeconds( 2.0 ); } } - public override int PassiveTriggerRange{ get{ return 3; } } - public override TimeSpan ResetDelay{ get{ return TimeSpan.FromSeconds( 0.5 ); } } + public override TimeSpan PassiveTriggerDelay => TimeSpan.FromSeconds( 2.0 ); + public override int PassiveTriggerRange => 3; + public override TimeSpan ResetDelay => TimeSpan.FromSeconds( 0.5 ); private int m_MinDamage; diff --git a/Scripts/Items/Traps/GasTrap.cs b/Scripts/Items/Traps/GasTrap.cs index c72c7b778..4c0effc15 100644 --- a/Scripts/Items/Traps/GasTrap.cs +++ b/Scripts/Items/Traps/GasTrap.cs @@ -76,9 +76,9 @@ namespace Server.Items } public override bool PassivelyTriggered => false; - public override TimeSpan PassiveTriggerDelay{ get{ return TimeSpan.Zero; } } - public override int PassiveTriggerRange{ get{ return 0; } } - public override TimeSpan ResetDelay{ get{ return TimeSpan.FromSeconds( 0.0 ); } } + public override TimeSpan PassiveTriggerDelay => TimeSpan.Zero; + public override int PassiveTriggerRange => 0; + public override TimeSpan ResetDelay => TimeSpan.FromSeconds( 0.0 ); public override void OnTrigger( Mobile from ) { diff --git a/Scripts/Items/Traps/GiantSpikeTrap.cs b/Scripts/Items/Traps/GiantSpikeTrap.cs index 0ae2b838e..1af990fdc 100644 --- a/Scripts/Items/Traps/GiantSpikeTrap.cs +++ b/Scripts/Items/Traps/GiantSpikeTrap.cs @@ -12,9 +12,9 @@ namespace Server.Items } public override bool PassivelyTriggered => true; - public override TimeSpan PassiveTriggerDelay{ get{ return TimeSpan.Zero; } } - public override int PassiveTriggerRange{ get{ return 3; } } - public override TimeSpan ResetDelay{ get{ return TimeSpan.FromSeconds( 0.0 ); } } + public override TimeSpan PassiveTriggerDelay => TimeSpan.Zero; + public override int PassiveTriggerRange => 3; + public override TimeSpan ResetDelay => TimeSpan.FromSeconds( 0.0 ); public override void OnTrigger( Mobile from ) { diff --git a/Scripts/Items/Traps/MushroomTrap.cs b/Scripts/Items/Traps/MushroomTrap.cs index 7979f74af..75d865e84 100644 --- a/Scripts/Items/Traps/MushroomTrap.cs +++ b/Scripts/Items/Traps/MushroomTrap.cs @@ -13,9 +13,9 @@ namespace Server.Items } public override bool PassivelyTriggered => true; - public override TimeSpan PassiveTriggerDelay{ get{ return TimeSpan.Zero; } } - public override int PassiveTriggerRange{ get{ return 2; } } - public override TimeSpan ResetDelay{ get{ return TimeSpan.Zero; } } + public override TimeSpan PassiveTriggerDelay => TimeSpan.Zero; + public override int PassiveTriggerRange => 2; + public override TimeSpan ResetDelay => TimeSpan.Zero; public override void OnTrigger( Mobile from ) { diff --git a/Scripts/Items/Traps/SawTrap.cs b/Scripts/Items/Traps/SawTrap.cs index cc621499f..b0f88e4fb 100644 --- a/Scripts/Items/Traps/SawTrap.cs +++ b/Scripts/Items/Traps/SawTrap.cs @@ -59,9 +59,9 @@ namespace Server.Items } public override bool PassivelyTriggered => false; - public override TimeSpan PassiveTriggerDelay{ get{ return TimeSpan.Zero; } } - public override int PassiveTriggerRange{ get{ return 0; } } - public override TimeSpan ResetDelay{ get{ return TimeSpan.FromSeconds( 0.0 ); } } + public override TimeSpan PassiveTriggerDelay => TimeSpan.Zero; + public override int PassiveTriggerRange => 0; + public override TimeSpan ResetDelay => TimeSpan.FromSeconds( 0.0 ); public override void OnTrigger( Mobile from ) { diff --git a/Scripts/Items/Traps/SpikeTrap.cs b/Scripts/Items/Traps/SpikeTrap.cs index b565233c7..c9cadfae0 100644 --- a/Scripts/Items/Traps/SpikeTrap.cs +++ b/Scripts/Items/Traps/SpikeTrap.cs @@ -92,9 +92,9 @@ namespace Server.Items } public override bool PassivelyTriggered => false; - public override TimeSpan PassiveTriggerDelay{ get{ return TimeSpan.Zero; } } - public override int PassiveTriggerRange{ get{ return 0; } } - public override TimeSpan ResetDelay{ get{ return TimeSpan.FromSeconds( 6.0 ); } } + public override TimeSpan PassiveTriggerDelay => TimeSpan.Zero; + public override int PassiveTriggerRange => 0; + public override TimeSpan ResetDelay => TimeSpan.FromSeconds( 6.0 ); public override void OnTrigger( Mobile from ) { diff --git a/Scripts/Items/Traps/StoneFaceTrap.cs b/Scripts/Items/Traps/StoneFaceTrap.cs index 9a4683729..c79a6977d 100644 --- a/Scripts/Items/Traps/StoneFaceTrap.cs +++ b/Scripts/Items/Traps/StoneFaceTrap.cs @@ -78,9 +78,9 @@ namespace Server.Items } public override bool PassivelyTriggered => true; - public override TimeSpan PassiveTriggerDelay{ get{ return TimeSpan.Zero; } } - public override int PassiveTriggerRange{ get{ return 2; } } - public override TimeSpan ResetDelay{ get{ return TimeSpan.Zero; } } + public override TimeSpan PassiveTriggerDelay => TimeSpan.Zero; + public override int PassiveTriggerRange => 2; + public override TimeSpan ResetDelay => TimeSpan.Zero; public override void OnTrigger( Mobile from ) { diff --git a/Scripts/Items/TreasureChests/TreasureChestLevel1.cs b/Scripts/Items/TreasureChests/TreasureChestLevel1.cs index 6e056beba..b8a84f1bd 100644 --- a/Scripts/Items/TreasureChests/TreasureChestLevel1.cs +++ b/Scripts/Items/TreasureChests/TreasureChestLevel1.cs @@ -10,7 +10,7 @@ namespace Server.Items public override bool IsDecoContainer => false; - public override TimeSpan DecayTime { get { return TimeSpan.FromMinutes( Utility.Random( 15, 60 ) ); } } + public override TimeSpan DecayTime => TimeSpan.FromMinutes( Utility.Random( 15, 60 ) ); private void SetChestAppearance() { @@ -35,9 +35,9 @@ namespace Server.Items } } - public override int DefaultGumpID { get { return 0x42; } } + public override int DefaultGumpID => 0x42; - public override int DefaultDropSound { get { return 0x42; } } + public override int DefaultDropSound => 0x42; public override Rectangle2D Bounds { diff --git a/Scripts/Items/TreasureChests/TreasureChestLevel2.cs b/Scripts/Items/TreasureChests/TreasureChestLevel2.cs index 776f98f0e..edd77aa29 100644 --- a/Scripts/Items/TreasureChests/TreasureChestLevel2.cs +++ b/Scripts/Items/TreasureChests/TreasureChestLevel2.cs @@ -10,7 +10,7 @@ namespace Server.Items public override bool IsDecoContainer => false; - public override TimeSpan DecayTime { get { return TimeSpan.FromMinutes( Utility.Random( 15, 60 ) ); } } + public override TimeSpan DecayTime => TimeSpan.FromMinutes( Utility.Random( 15, 60 ) ); private void SetChestAppearance() { @@ -60,9 +60,9 @@ namespace Server.Items } } - public override int DefaultGumpID { get { return 0x42; } } + public override int DefaultGumpID => 0x42; - public override int DefaultDropSound { get { return 0x42; } } + public override int DefaultDropSound => 0x42; public override Rectangle2D Bounds { diff --git a/Scripts/Items/TreasureChests/TreasureChestLevel3.cs b/Scripts/Items/TreasureChests/TreasureChestLevel3.cs index 78743467d..65c3bbe7a 100644 --- a/Scripts/Items/TreasureChests/TreasureChestLevel3.cs +++ b/Scripts/Items/TreasureChests/TreasureChestLevel3.cs @@ -10,7 +10,7 @@ namespace Server.Items public override bool IsDecoContainer => false; - public override TimeSpan DecayTime { get { return TimeSpan.FromMinutes( Utility.Random( 15, 60 ) ); } } + public override TimeSpan DecayTime => TimeSpan.FromMinutes( Utility.Random( 15, 60 ) ); private void SetChestAppearance() { @@ -34,9 +34,9 @@ namespace Server.Items } } - public override int DefaultGumpID { get { return 0x42; } } + public override int DefaultGumpID => 0x42; - public override int DefaultDropSound { get { return 0x42; } } + public override int DefaultDropSound => 0x42; public override Rectangle2D Bounds { diff --git a/Scripts/Items/TreasureChests/TreasureChestLevel4.cs b/Scripts/Items/TreasureChests/TreasureChestLevel4.cs index 0a3ffbd02..49e89ec54 100644 --- a/Scripts/Items/TreasureChests/TreasureChestLevel4.cs +++ b/Scripts/Items/TreasureChests/TreasureChestLevel4.cs @@ -10,7 +10,7 @@ namespace Server.Items public override bool IsDecoContainer => false; - public override TimeSpan DecayTime { get { return TimeSpan.FromMinutes( Utility.Random( 15, 60 ) ); } } + public override TimeSpan DecayTime => TimeSpan.FromMinutes( Utility.Random( 15, 60 ) ); private void SetChestAppearance() { @@ -40,9 +40,9 @@ namespace Server.Items } } - public override int DefaultGumpID { get { return 0x42; } } + public override int DefaultGumpID => 0x42; - public override int DefaultDropSound { get { return 0x42; } } + public override int DefaultDropSound => 0x42; public override Rectangle2D Bounds { diff --git a/Scripts/Items/Wands/BaseWand.cs b/Scripts/Items/Wands/BaseWand.cs index 2dcfe15b4..1b55b3999 100644 --- a/Scripts/Items/Wands/BaseWand.cs +++ b/Scripts/Items/Wands/BaseWand.cs @@ -24,22 +24,22 @@ namespace Server.Items public abstract class BaseWand : BaseBashing, ITokunoDyable { - public override WeaponAbility PrimaryAbility { get { return WeaponAbility.Dismount; } } - public override WeaponAbility SecondaryAbility { get { return WeaponAbility.Disarm; } } + public override WeaponAbility PrimaryAbility => WeaponAbility.Dismount; + public override WeaponAbility SecondaryAbility => WeaponAbility.Disarm; - public override int AosStrengthReq { get { return 5; } } - public override int AosMinDamage { get { return 9; } } - public override int AosMaxDamage { get { return 11; } } - public override int AosSpeed { get { return 40; } } - public override float MlSpeed{ get{ return 2.75f; } } + public override int AosStrengthReq => 5; + public override int AosMinDamage => 9; + public override int AosMaxDamage => 11; + public override int AosSpeed => 40; + public override float MlSpeed => 2.75f; - public override int OldStrengthReq { get { return 0; } } - public override int OldMinDamage { get { return 2; } } - public override int OldMaxDamage { get { return 6; } } - public override int OldSpeed { get { return 35; } } + public override int OldStrengthReq => 0; + public override int OldMinDamage => 2; + public override int OldMaxDamage => 6; + public override int OldSpeed => 35; - public override int InitMinHits { get { return 31; } } - public override int InitMaxHits { get { return 110; } } + public override int InitMinHits => 31; + public override int InitMaxHits => 110; private WandEffect m_WandEffect; private int m_Charges; @@ -251,4 +251,4 @@ namespace Server.Items return true; } } -} \ No newline at end of file +} diff --git a/Scripts/Items/Wands/IDWand.cs b/Scripts/Items/Wands/IDWand.cs index a52eb32cb..4cc4f1469 100644 --- a/Scripts/Items/Wands/IDWand.cs +++ b/Scripts/Items/Wands/IDWand.cs @@ -6,7 +6,7 @@ namespace Server.Items { public class IDWand : BaseWand { - public override TimeSpan GetUseDelay{ get{ return TimeSpan.Zero; } } + public override TimeSpan GetUseDelay => TimeSpan.Zero; [Constructible] public IDWand() : base( WandEffect.Identification, 25, 175 ) @@ -44,4 +44,4 @@ namespace Server.Items return ( o is Item ); } } -} \ No newline at end of file +} diff --git a/Scripts/Items/Weapons/Abilities/ArmorIgnore.cs b/Scripts/Items/Weapons/Abilities/ArmorIgnore.cs index e1a736857..5b11e6bd7 100644 --- a/Scripts/Items/Weapons/Abilities/ArmorIgnore.cs +++ b/Scripts/Items/Weapons/Abilities/ArmorIgnore.cs @@ -13,8 +13,8 @@ namespace Server.Items { } - public override int BaseMana{ get{ return 30; } } - public override double DamageScalar{ get{ return 0.9; } } + public override int BaseMana => 30; + public override double DamageScalar => 0.9; public override void OnHit( Mobile attacker, Mobile defender, int damage ) { @@ -30,4 +30,4 @@ namespace Server.Items defender.FixedParticles( 0x3728, 200, 25, 9942, EffectLayer.Waist ); } } -} \ No newline at end of file +} diff --git a/Scripts/Items/Weapons/Abilities/ArmorPierce.cs b/Scripts/Items/Weapons/Abilities/ArmorPierce.cs index 467f26596..0a4559d41 100644 --- a/Scripts/Items/Weapons/Abilities/ArmorPierce.cs +++ b/Scripts/Items/Weapons/Abilities/ArmorPierce.cs @@ -23,8 +23,8 @@ namespace Server.Items return base.CheckSkills( from ); } - public override int BaseMana{ get{ return 30; } } - public override double DamageScalar{ get{ return 1.5; } } + public override int BaseMana => 30; + public override double DamageScalar => 1.5; public override bool RequiresSE => true; diff --git a/Scripts/Items/Weapons/Abilities/BleedAttack.cs b/Scripts/Items/Weapons/Abilities/BleedAttack.cs index 293c92d2e..094f727f7 100644 --- a/Scripts/Items/Weapons/Abilities/BleedAttack.cs +++ b/Scripts/Items/Weapons/Abilities/BleedAttack.cs @@ -10,7 +10,7 @@ namespace Server.Items /// /// Make your opponent bleed profusely with this wicked use of your weapon. /// When successful, the target will bleed for several seconds, taking damage as time passes for up to ten seconds. - /// The rate of damage slows down as time passes, and the blood loss can be completely staunched with the use of bandages. + /// The rate of damage slows down as time passes, and the blood loss can be completely staunched with the use of bandages. /// public class BleedAttack : WeaponAbility { @@ -18,7 +18,7 @@ namespace Server.Items { } - public override int BaseMana{ get{ return 30; } } + public override int BaseMana => 30; public override void OnHit( Mobile attacker, Mobile defender, int damage ) { @@ -132,4 +132,4 @@ namespace Server.Items } } } -} \ No newline at end of file +} diff --git a/Scripts/Items/Weapons/Abilities/Block.cs b/Scripts/Items/Weapons/Abilities/Block.cs index 681d4bf01..7d8e107d9 100644 --- a/Scripts/Items/Weapons/Abilities/Block.cs +++ b/Scripts/Items/Weapons/Abilities/Block.cs @@ -13,7 +13,7 @@ namespace Server.Items { } - public override int BaseMana{ get{ return 30; } } + public override int BaseMana => 30; public override bool CheckSkills( Mobile from ) { @@ -108,4 +108,4 @@ namespace Server.Items } } } -} \ No newline at end of file +} diff --git a/Scripts/Items/Weapons/Abilities/ConcussionBlow.cs b/Scripts/Items/Weapons/Abilities/ConcussionBlow.cs index 5a83af91a..ce4aa718e 100644 --- a/Scripts/Items/Weapons/Abilities/ConcussionBlow.cs +++ b/Scripts/Items/Weapons/Abilities/ConcussionBlow.cs @@ -11,7 +11,7 @@ namespace Server.Items { } - public override int BaseMana{ get{ return 25; } } + public override int BaseMana => 25; public override bool OnBeforeDamage( Mobile attacker, Mobile defender ) { @@ -30,7 +30,7 @@ namespace Server.Items int damage = 10; // Base damage is 10. - if ( defender.HitsMax > 0 ) + if ( defender.HitsMax > 0 ) { double hitsPercent = ( (double)defender.Hits / (double)defender.HitsMax ) * 100.0; @@ -49,4 +49,4 @@ namespace Server.Items return true; } } -} \ No newline at end of file +} diff --git a/Scripts/Items/Weapons/Abilities/CrushingBlow.cs b/Scripts/Items/Weapons/Abilities/CrushingBlow.cs index 0aea1a861..6fae634c2 100644 --- a/Scripts/Items/Weapons/Abilities/CrushingBlow.cs +++ b/Scripts/Items/Weapons/Abilities/CrushingBlow.cs @@ -11,8 +11,8 @@ namespace Server.Items { } - public override int BaseMana{ get{ return 25; } } - public override double DamageScalar{ get{ return 1.5; } } + public override int BaseMana => 25; + public override double DamageScalar => 1.5; public override void OnHit( Mobile attacker, Mobile defender, int damage ) @@ -31,4 +31,4 @@ namespace Server.Items Effects.SendMovingParticles( new Entity( Serial.Zero, new Point3D( defender.X, defender.Y, defender.Z + 50 ), defender.Map ), new Entity( Serial.Zero, new Point3D( defender.X, defender.Y, defender.Z + 20 ), defender.Map ), 0xFB4, 1, 0, false, false, 0, 3, 9501, 1, 0, EffectLayer.Head, 0x100 ); } } -} \ No newline at end of file +} diff --git a/Scripts/Items/Weapons/Abilities/DefenseMastery.cs b/Scripts/Items/Weapons/Abilities/DefenseMastery.cs index b6cb3d47f..814b7e1dc 100644 --- a/Scripts/Items/Weapons/Abilities/DefenseMastery.cs +++ b/Scripts/Items/Weapons/Abilities/DefenseMastery.cs @@ -24,7 +24,7 @@ namespace Server.Items return base.CheckSkills( from ); } - public override int BaseMana { get { return 30; } } + public override int BaseMana => 30; public override void OnHit( Mobile attacker, Mobile defender, int damage ) { @@ -100,4 +100,4 @@ namespace Server.Items info.m_From.Delta( MobileDelta.WeaponDamage ); } } -} \ No newline at end of file +} diff --git a/Scripts/Items/Weapons/Abilities/Disarm.cs b/Scripts/Items/Weapons/Abilities/Disarm.cs index 44554af55..0dbb44e16 100644 --- a/Scripts/Items/Weapons/Abilities/Disarm.cs +++ b/Scripts/Items/Weapons/Abilities/Disarm.cs @@ -12,7 +12,7 @@ namespace Server.Items { } - public override int BaseMana{ get{ return 20; } } + public override int BaseMana => 20; // No longer active in pub21: /*public override bool CheckSkills( Mobile from ) @@ -81,4 +81,4 @@ namespace Server.Items } } } -} \ No newline at end of file +} diff --git a/Scripts/Items/Weapons/Abilities/Dismount.cs b/Scripts/Items/Weapons/Abilities/Dismount.cs index 3fd4b7bd1..af682d681 100644 --- a/Scripts/Items/Weapons/Abilities/Dismount.cs +++ b/Scripts/Items/Weapons/Abilities/Dismount.cs @@ -15,7 +15,7 @@ namespace Server.Items { } - public override int BaseMana{ get{ return 20; } } + public override int BaseMana => 20; public override bool Validate( Mobile from ) { @@ -31,7 +31,7 @@ namespace Server.Items return true; } - public static readonly TimeSpan RemountDelay = TimeSpan.FromSeconds( 10.0 ); + public static readonly TimeSpan RemountDelay = TimeSpan.FromSeconds( 10.0 ); public override void OnHit( Mobile attacker, Mobile defender, int damage ) { @@ -105,9 +105,9 @@ namespace Server.Items pm.SetMountBlock(BlockMountType.DismountRecovery, RemountDelay, false ); } } - + if ( !attacker.Mounted ) AOS.Damage( defender, attacker, Utility.RandomMinMax( 15, 25 ), 100, 0, 0, 0, 0 ); } } -} \ No newline at end of file +} diff --git a/Scripts/Items/Weapons/Abilities/Disrobe.cs b/Scripts/Items/Weapons/Abilities/Disrobe.cs index aa7bb36fd..7c2680f72 100644 --- a/Scripts/Items/Weapons/Abilities/Disrobe.cs +++ b/Scripts/Items/Weapons/Abilities/Disrobe.cs @@ -11,7 +11,7 @@ namespace Server.Items { } - public override int BaseMana{ get{ return 20; } } // Not Sure what amount of mana a creature uses. + public override int BaseMana => 20; // Not Sure what amount of mana a creature uses. public static readonly TimeSpan BlockEquipDuration = TimeSpan.FromSeconds( 5.0 ); @@ -21,7 +21,7 @@ namespace Server.Items return; ClearCurrentAbility( attacker ); - Item toDisrobe = defender.FindItemOnLayer(Layer.InnerTorso); + Item toDisrobe = defender.FindItemOnLayer(Layer.InnerTorso); if ( toDisrobe == null || !toDisrobe.Movable ) toDisrobe = defender.FindItemOnLayer( Layer.OuterTorso ); diff --git a/Scripts/Items/Weapons/Abilities/DoubleShot.cs b/Scripts/Items/Weapons/Abilities/DoubleShot.cs index 10d522684..6ba15d80c 100644 --- a/Scripts/Items/Weapons/Abilities/DoubleShot.cs +++ b/Scripts/Items/Weapons/Abilities/DoubleShot.cs @@ -12,7 +12,7 @@ namespace Server.Items { } - public override int BaseMana { get { return 30; } } + public override int BaseMana => 30; public override bool CheckSkills( Mobile from ) { @@ -66,4 +66,4 @@ namespace Server.Items attacker.Weapon.OnSwing( attacker, defender ); } } -} \ No newline at end of file +} diff --git a/Scripts/Items/Weapons/Abilities/DoubleStrike.cs b/Scripts/Items/Weapons/Abilities/DoubleStrike.cs index 8a2abc29a..920da2f51 100644 --- a/Scripts/Items/Weapons/Abilities/DoubleStrike.cs +++ b/Scripts/Items/Weapons/Abilities/DoubleStrike.cs @@ -4,7 +4,7 @@ namespace Server.Items { /// /// The highly skilled warrior can use this special attack to make two quick swings in succession. - /// Landing both blows would be devastating! + /// Landing both blows would be devastating! /// public class DoubleStrike : WeaponAbility { @@ -12,8 +12,8 @@ namespace Server.Items { } - public override int BaseMana{ get{ return 30; } } - public override double DamageScalar{ get{ return 0.9; } } + public override int BaseMana => 30; + public override double DamageScalar => 0.9; public override void OnHit( Mobile attacker, Mobile defender, int damage ) { @@ -54,4 +54,4 @@ namespace Server.Items } } } -} \ No newline at end of file +} diff --git a/Scripts/Items/Weapons/Abilities/DualWield.cs b/Scripts/Items/Weapons/Abilities/DualWield.cs index b878e1ce9..60e2b077b 100644 --- a/Scripts/Items/Weapons/Abilities/DualWield.cs +++ b/Scripts/Items/Weapons/Abilities/DualWield.cs @@ -11,13 +11,13 @@ namespace Server.Items public class DualWield : WeaponAbility { private static Hashtable m_Registry = new Hashtable(); - public static Hashtable Registry { get { return m_Registry; } } + public static Hashtable Registry => m_Registry; public DualWield() { } - public override int BaseMana { get { return 30; } } + public override int BaseMana => 30; public override bool CheckSkills( Mobile from ) { @@ -59,7 +59,7 @@ namespace Server.Items private Mobile m_Owner; private int m_BonusSwingSpeed; - public int BonusSwingSpeed { get { return m_BonusSwingSpeed; } } + public int BonusSwingSpeed => m_BonusSwingSpeed; public DualWieldTimer( Mobile owner, int bonusSwingSpeed ) : base( TimeSpan.FromSeconds( 6.0 ) ) @@ -75,4 +75,4 @@ namespace Server.Items } } } -} \ No newline at end of file +} diff --git a/Scripts/Items/Weapons/Abilities/Feint.cs b/Scripts/Items/Weapons/Abilities/Feint.cs index c61e13816..50c3b76da 100644 --- a/Scripts/Items/Weapons/Abilities/Feint.cs +++ b/Scripts/Items/Weapons/Abilities/Feint.cs @@ -11,13 +11,13 @@ namespace Server.Items public class Feint : WeaponAbility { private static Hashtable m_Registry = new Hashtable(); - public static Hashtable Registry { get { return m_Registry; } } + public static Hashtable Registry => m_Registry; public Feint() { } - public override int BaseMana { get { return 30; } } + public override int BaseMana => 30; public override bool CheckSkills( Mobile from ) { @@ -60,7 +60,7 @@ namespace Server.Items private Mobile m_Defender; private int m_SwingSpeedReduction; - public int SwingSpeedReduction { get { return m_SwingSpeedReduction; } } + public int SwingSpeedReduction => m_SwingSpeedReduction; public FeintTimer( Mobile defender, int swingSpeedReduction ) : base( TimeSpan.FromSeconds( 6.0 ) ) @@ -76,4 +76,4 @@ namespace Server.Items } } } -} \ No newline at end of file +} diff --git a/Scripts/Items/Weapons/Abilities/FrenziedWhirlwind.cs b/Scripts/Items/Weapons/Abilities/FrenziedWhirlwind.cs index f20e876a8..4035461f7 100644 --- a/Scripts/Items/Weapons/Abilities/FrenziedWhirlwind.cs +++ b/Scripts/Items/Weapons/Abilities/FrenziedWhirlwind.cs @@ -26,10 +26,10 @@ namespace Server.Items return base.CheckSkills( from ); } - public override int BaseMana { get { return 30; } } + public override int BaseMana => 30; private static Hashtable m_Registry = new Hashtable(); - public static Hashtable Registry { get { return m_Registry; } } + public static Hashtable Registry => m_Registry; public override void OnHit( Mobile attacker, Mobile defender, int damage ) { @@ -165,4 +165,4 @@ namespace Server.Items } } } -} \ No newline at end of file +} diff --git a/Scripts/Items/Weapons/Abilities/InfectiousStrike.cs b/Scripts/Items/Weapons/Abilities/InfectiousStrike.cs index e705f89b8..3181f9c4c 100644 --- a/Scripts/Items/Weapons/Abilities/InfectiousStrike.cs +++ b/Scripts/Items/Weapons/Abilities/InfectiousStrike.cs @@ -4,7 +4,7 @@ namespace Server.Items { /// /// This special move represents a significant change to the use of poisons in Age of Shadows. - /// Now, only certain weapon types — those that have Infectious Strike as an available special move — will be able to be poisoned. + /// Now, only certain weapon types � those that have Infectious Strike as an available special move � will be able to be poisoned. /// Targets will no longer be poisoned at random when hit by poisoned weapons. /// Instead, the wielder must use this ability to deliver the venom. /// While no skill in Poisoning is directly required to use this ability, being knowledgeable in the application and use of toxins @@ -18,7 +18,7 @@ namespace Server.Items { } - public override int BaseMana{ get{ return 15; } } + public override int BaseMana => 15; public override bool RequiresTactics( Mobile from ) { @@ -50,7 +50,7 @@ namespace Server.Items --weapon.PoisonCharges; - // Infectious strike special move now uses poisoning skill to help determine potency + // Infectious strike special move now uses poisoning skill to help determine potency int maxLevel = attacker.Skills[SkillName.Poisoning].Fixed / 200; if ( maxLevel < 0 ) maxLevel = 0; if ( p.Level > maxLevel ) p = Poison.GetPoison( maxLevel ); @@ -74,9 +74,9 @@ namespace Server.Items if ( defender.ApplyPoison( attacker, p ) != ApplyPoisonResult.Immune ) { - attacker.SendLocalizedMessage( 1008096, true, defender.Name ); // You have poisoned your target : + attacker.SendLocalizedMessage( 1008096, true, defender.Name ); // You have poisoned your target : defender.SendLocalizedMessage( 1008097, false, attacker.Name ); // : poisoned you! } } } -} \ No newline at end of file +} diff --git a/Scripts/Items/Weapons/Abilities/MortalStrike.cs b/Scripts/Items/Weapons/Abilities/MortalStrike.cs index 1d5f4e365..9dc0db6ac 100644 --- a/Scripts/Items/Weapons/Abilities/MortalStrike.cs +++ b/Scripts/Items/Weapons/Abilities/MortalStrike.cs @@ -5,7 +5,7 @@ namespace Server.Items { /// /// The assassin's friend. - /// A successful Mortal Strike will render its victim unable to heal any damage for several seconds. + /// A successful Mortal Strike will render its victim unable to heal any damage for several seconds. /// Use a gruesome follow-up to finish off your foe. /// public class MortalStrike : WeaponAbility @@ -14,7 +14,7 @@ namespace Server.Items { } - public override int BaseMana{ get{ return 30; } } + public override int BaseMana => 30; public static readonly TimeSpan PlayerDuration = TimeSpan.FromSeconds( 6.0 ); public static readonly TimeSpan NPCDuration = TimeSpan.FromSeconds( 12.0 ); @@ -93,4 +93,4 @@ namespace Server.Items } } } -} \ No newline at end of file +} diff --git a/Scripts/Items/Weapons/Abilities/MovingShot.cs b/Scripts/Items/Weapons/Abilities/MovingShot.cs index 74d7f2843..59913764e 100644 --- a/Scripts/Items/Weapons/Abilities/MovingShot.cs +++ b/Scripts/Items/Weapons/Abilities/MovingShot.cs @@ -12,8 +12,8 @@ namespace Server.Items { } - public override int BaseMana{ get{ return 15; } } - public override int AccuracyBonus{ get{ return -25; } } + public override int BaseMana => 15; + public override int AccuracyBonus => -25; public override bool OnBeforeSwing( Mobile attacker, Mobile defender ) { diff --git a/Scripts/Items/Weapons/Abilities/NerveStrike.cs b/Scripts/Items/Weapons/Abilities/NerveStrike.cs index ed6d51714..2ff55cb54 100644 --- a/Scripts/Items/Weapons/Abilities/NerveStrike.cs +++ b/Scripts/Items/Weapons/Abilities/NerveStrike.cs @@ -12,7 +12,7 @@ namespace Server.Items { } - public override int BaseMana { get { return 30; } } + public override int BaseMana => 30; public override bool CheckSkills( Mobile from ) { @@ -67,7 +67,7 @@ namespace Server.Items if (!cantpara && ((150.0 / 7.0 + (4.0 * attacker.Skills[SkillName.Bushido].Value) / 7.0) / 100.0) > Utility.RandomDouble()) { defender.Paralyze( TimeSpan.FromSeconds( 2.0 ) ); - Server.Items.ParalyzingBlow.BeginImmunity( defender, Server.Items.ParalyzingBlow.FreezeDelayDuration ); + Server.Items.ParalyzingBlow.BeginImmunity( defender, Server.Items.ParalyzingBlow.FreezeDelayDuration ); } } else if( !cantpara ) diff --git a/Scripts/Items/Weapons/Abilities/ParalyzingBlow.cs b/Scripts/Items/Weapons/Abilities/ParalyzingBlow.cs index c29584ab4..943894a2d 100644 --- a/Scripts/Items/Weapons/Abilities/ParalyzingBlow.cs +++ b/Scripts/Items/Weapons/Abilities/ParalyzingBlow.cs @@ -12,7 +12,7 @@ namespace Server.Items { } - public override int BaseMana{ get{ return 30; } } + public override int BaseMana => 30; public static readonly TimeSpan PlayerFreezeDuration = TimeSpan.FromSeconds( 3.0 ); public static readonly TimeSpan NPCFreezeDuration = TimeSpan.FromSeconds( 6.0 ); @@ -133,4 +133,4 @@ namespace Server.Items } } } -} \ No newline at end of file +} diff --git a/Scripts/Items/Weapons/Abilities/RidingSwipe.cs b/Scripts/Items/Weapons/Abilities/RidingSwipe.cs index e7ceb6a4d..9bc2e4ff9 100644 --- a/Scripts/Items/Weapons/Abilities/RidingSwipe.cs +++ b/Scripts/Items/Weapons/Abilities/RidingSwipe.cs @@ -16,7 +16,7 @@ namespace Server.Items { } - public override int BaseMana { get { return 30; } } + public override int BaseMana => 30; public override bool RequiresSE => true; diff --git a/Scripts/Items/Weapons/Abilities/ShadowStrike.cs b/Scripts/Items/Weapons/Abilities/ShadowStrike.cs index 2c64521bf..bd5c4998f 100644 --- a/Scripts/Items/Weapons/Abilities/ShadowStrike.cs +++ b/Scripts/Items/Weapons/Abilities/ShadowStrike.cs @@ -4,7 +4,7 @@ namespace Server.Items { /// /// This powerful ability requires secondary skills to activate. - /// Successful use of Shadowstrike deals extra damage to the target — and renders the attacker invisible! + /// Successful use of Shadowstrike deals extra damage to the target � and renders the attacker invisible! /// Only those who are adept at the art of stealth will be able to use this ability. /// public class ShadowStrike : WeaponAbility @@ -13,8 +13,8 @@ namespace Server.Items { } - public override int BaseMana{ get{ return 20; } } - public override double DamageScalar{ get{ return 1.25; } } + public override int BaseMana => 20; + public override double DamageScalar => 1.25; public override bool RequiresTactics( Mobile from ) { @@ -56,4 +56,4 @@ namespace Server.Items attacker.Hidden = true; } } -} \ No newline at end of file +} diff --git a/Scripts/Items/Weapons/Abilities/TalonStrike.cs b/Scripts/Items/Weapons/Abilities/TalonStrike.cs index 648f0697f..930e30b76 100644 --- a/Scripts/Items/Weapons/Abilities/TalonStrike.cs +++ b/Scripts/Items/Weapons/Abilities/TalonStrike.cs @@ -11,14 +11,14 @@ namespace Server.Items public class TalonStrike : WeaponAbility { private static Hashtable m_Registry = new Hashtable(); - public static Hashtable Registry { get { return m_Registry; } } + public static Hashtable Registry => m_Registry; public TalonStrike() { } - public override int BaseMana { get { return 30; } } - public override double DamageScalar { get { return 1.2; } } + public override int BaseMana => 30; + public override double DamageScalar => 1.2; public override bool CheckSkills( Mobile from ) { @@ -103,4 +103,4 @@ namespace Server.Items } } } -} \ No newline at end of file +} diff --git a/Scripts/Items/Weapons/Abilities/WeaponAbility.cs b/Scripts/Items/Weapons/Abilities/WeaponAbility.cs index 76d73b2b7..3a07ea83d 100644 --- a/Scripts/Items/Weapons/Abilities/WeaponAbility.cs +++ b/Scripts/Items/Weapons/Abilities/WeaponAbility.cs @@ -14,7 +14,7 @@ namespace Server.Items public virtual int AccuracyBonus{ get{ return 0; } } public virtual double DamageScalar{ get{ return 1.0; } } - public virtual bool RequiresSE { get { return false; } } + public virtual bool RequiresSE => false; public virtual void OnHit( Mobile attacker, Mobile defender, int damage ) { @@ -76,7 +76,7 @@ namespace Server.Items scalar -= (double)lmc / 100; mana = (int)(mana * scalar); - // Using a special move within 3 seconds of the previous special move costs double mana + // Using a special move within 3 seconds of the previous special move costs double mana if ( GetContext( from ) != null ) mana *= 2; @@ -181,7 +181,7 @@ namespace Server.Items from.SendLocalizedMessage( 1063456 ); // You must upgrade to Samurai Empire in order to use that ability. return false; } - + if ( Spells.Bushido.HonorableExecution.IsUnderPenalty( from ) || Spells.Ninjitsu.AnimalForm.UnderTransformation( from ) ) { from.SendLocalizedMessage( 1063024 ); // You cannot perform this special move right now. @@ -243,7 +243,7 @@ namespace Server.Items option = "Double Shot"; else if ( this is ArmorPierce ) option = "Armor Pierce"; - + if ( option != null && !Engines.ConPVP.DuelContext.AllowSpecialAbility( from, option, true ) ) return false; @@ -341,7 +341,7 @@ namespace Server.Items return ( weapon != null && (weapon.PrimaryAbility == a || weapon.SecondaryAbility == a) ); } - public virtual bool ValidatesDuringHit{ get { return true; } } + public virtual bool ValidatesDuringHit => true; public static WeaponAbility GetCurrentAbility( Mobile m ) { @@ -486,4 +486,4 @@ namespace Server.Items } } } -} \ No newline at end of file +} diff --git a/Scripts/Items/Weapons/Abilities/WhirlwindAttack.cs b/Scripts/Items/Weapons/Abilities/WhirlwindAttack.cs index e376b1b49..c843568c0 100644 --- a/Scripts/Items/Weapons/Abilities/WhirlwindAttack.cs +++ b/Scripts/Items/Weapons/Abilities/WhirlwindAttack.cs @@ -14,7 +14,7 @@ namespace Server.Items { } - public override int BaseMana{ get{ return 15; } } + public override int BaseMana => 15; public override void OnHit( Mobile attacker, Mobile defender, int damage ) { @@ -70,7 +70,7 @@ namespace Server.Items if ( damageBonus > 2.0 ) damageBonus = 2.0; - + attacker.RevealingAction(); for ( int i = 0; i < targets.Count; ++i ) @@ -85,4 +85,4 @@ namespace Server.Items } } } -} \ No newline at end of file +} diff --git a/Scripts/Items/Weapons/Artifacts/AxeOfTheHeavens.cs b/Scripts/Items/Weapons/Artifacts/AxeOfTheHeavens.cs index 29914d23e..8996b43a7 100644 --- a/Scripts/Items/Weapons/Artifacts/AxeOfTheHeavens.cs +++ b/Scripts/Items/Weapons/Artifacts/AxeOfTheHeavens.cs @@ -5,11 +5,11 @@ namespace Server.Items { public class AxeOfTheHeavens : DoubleAxe { - public override int LabelNumber{ get{ return 1061106; } } // Axe of the Heavens - public override int ArtifactRarity{ get{ return 11; } } + public override int LabelNumber => 1061106; // Axe of the Heavens + public override int ArtifactRarity => 11; - public override int InitMinHits{ get{ return 255; } } - public override int InitMaxHits{ get{ return 255; } } + public override int InitMinHits => 255; + public override int InitMaxHits => 255; [Constructible] public AxeOfTheHeavens() @@ -31,7 +31,7 @@ namespace Server.Items writer.Write( (int) 0 ); } - + public override void Deserialize(GenericReader reader) { base.Deserialize( reader ); @@ -39,4 +39,4 @@ namespace Server.Items int version = reader.ReadInt(); } } -} \ No newline at end of file +} diff --git a/Scripts/Items/Weapons/Artifacts/BladeOfInsanity.cs b/Scripts/Items/Weapons/Artifacts/BladeOfInsanity.cs index 236e18e46..7ea60b5bb 100644 --- a/Scripts/Items/Weapons/Artifacts/BladeOfInsanity.cs +++ b/Scripts/Items/Weapons/Artifacts/BladeOfInsanity.cs @@ -5,11 +5,11 @@ namespace Server.Items { public class BladeOfInsanity : Katana { - public override int LabelNumber{ get{ return 1061088; } } // Blade of Insanity - public override int ArtifactRarity{ get{ return 11; } } + public override int LabelNumber => 1061088; // Blade of Insanity + public override int ArtifactRarity => 11; - public override int InitMinHits{ get{ return 255; } } - public override int InitMaxHits{ get{ return 255; } } + public override int InitMinHits => 255; + public override int InitMaxHits => 255; [Constructible] public BladeOfInsanity() @@ -31,7 +31,7 @@ namespace Server.Items writer.Write( (int) 0 ); } - + public override void Deserialize(GenericReader reader) { base.Deserialize( reader ); @@ -42,4 +42,4 @@ namespace Server.Items Hue = 0x76D; } } -} \ No newline at end of file +} diff --git a/Scripts/Items/Weapons/Artifacts/BladeOfTheRighteous.cs b/Scripts/Items/Weapons/Artifacts/BladeOfTheRighteous.cs index e904d4890..0f3825252 100644 --- a/Scripts/Items/Weapons/Artifacts/BladeOfTheRighteous.cs +++ b/Scripts/Items/Weapons/Artifacts/BladeOfTheRighteous.cs @@ -5,11 +5,11 @@ namespace Server.Items { public class BladeOfTheRighteous : Longsword { - public override int LabelNumber{ get{ return 1061107; } } // Blade of the Righteous - public override int ArtifactRarity{ get{ return 10; } } + public override int LabelNumber => 1061107; // Blade of the Righteous + public override int ArtifactRarity => 10; - public override int InitMinHits{ get{ return 255; } } - public override int InitMaxHits{ get{ return 255; } } + public override int InitMinHits => 255; + public override int InitMaxHits => 255; [Constructible] public BladeOfTheRighteous() @@ -33,7 +33,7 @@ namespace Server.Items writer.Write( (int) 0 ); } - + public override void Deserialize(GenericReader reader) { base.Deserialize( reader ); @@ -44,4 +44,4 @@ namespace Server.Items Slayer = SlayerName.Exorcism; } } -} \ No newline at end of file +} diff --git a/Scripts/Items/Weapons/Artifacts/BoneCrusher.cs b/Scripts/Items/Weapons/Artifacts/BoneCrusher.cs index 405020c6e..05a0a28fb 100644 --- a/Scripts/Items/Weapons/Artifacts/BoneCrusher.cs +++ b/Scripts/Items/Weapons/Artifacts/BoneCrusher.cs @@ -5,11 +5,11 @@ namespace Server.Items { public class BoneCrusher : WarMace { - public override int LabelNumber{ get{ return 1061596; } } // Bone Crusher - public override int ArtifactRarity{ get{ return 11; } } + public override int LabelNumber => 1061596; // Bone Crusher + public override int ArtifactRarity => 11; - public override int InitMinHits{ get{ return 255; } } - public override int InitMaxHits{ get{ return 255; } } + public override int InitMinHits => 255; + public override int InitMaxHits => 255; [Constructible] public BoneCrusher() @@ -31,7 +31,7 @@ namespace Server.Items writer.Write( (int) 0 ); } - + public override void Deserialize(GenericReader reader) { base.Deserialize( reader ); @@ -45,4 +45,4 @@ namespace Server.Items ItemID = 0x1406; } } -} \ No newline at end of file +} diff --git a/Scripts/Items/Weapons/Artifacts/BreathOfTheDead.cs b/Scripts/Items/Weapons/Artifacts/BreathOfTheDead.cs index 0c20e15a7..08d19e970 100644 --- a/Scripts/Items/Weapons/Artifacts/BreathOfTheDead.cs +++ b/Scripts/Items/Weapons/Artifacts/BreathOfTheDead.cs @@ -5,11 +5,11 @@ namespace Server.Items { public class BreathOfTheDead : BoneHarvester { - public override int LabelNumber{ get{ return 1061109; } } // Breath of the Dead - public override int ArtifactRarity{ get{ return 11; } } + public override int LabelNumber => 1061109; // Breath of the Dead + public override int ArtifactRarity => 11; - public override int InitMinHits{ get{ return 255; } } - public override int InitMaxHits{ get{ return 255; } } + public override int InitMinHits => 255; + public override int InitMaxHits => 255; [Constructible] public BreathOfTheDead() @@ -31,7 +31,7 @@ namespace Server.Items writer.Write( (int) 0 ); } - + public override void Deserialize(GenericReader reader) { base.Deserialize( reader ); @@ -39,4 +39,4 @@ namespace Server.Items int version = reader.ReadInt(); } } -} \ No newline at end of file +} diff --git a/Scripts/Items/Weapons/Artifacts/Frostbringer.cs b/Scripts/Items/Weapons/Artifacts/Frostbringer.cs index 643732b1f..ea45978c8 100644 --- a/Scripts/Items/Weapons/Artifacts/Frostbringer.cs +++ b/Scripts/Items/Weapons/Artifacts/Frostbringer.cs @@ -5,11 +5,11 @@ namespace Server.Items { public class Frostbringer : Bow { - public override int LabelNumber{ get{ return 1061111; } } // Frostbringer - public override int ArtifactRarity{ get{ return 11; } } + public override int LabelNumber => 1061111; // Frostbringer + public override int ArtifactRarity => 11; - public override int InitMinHits{ get{ return 255; } } - public override int InitMaxHits{ get{ return 255; } } + public override int InitMinHits => 255; + public override int InitMaxHits => 255; [Constructible] public Frostbringer() @@ -36,7 +36,7 @@ namespace Server.Items writer.Write( (int) 0 ); } - + public override void Deserialize(GenericReader reader) { base.Deserialize( reader ); @@ -44,4 +44,4 @@ namespace Server.Items int version = reader.ReadInt(); } } -} \ No newline at end of file +} diff --git a/Scripts/Items/Weapons/Artifacts/LegacyOfTheDreadLord.cs b/Scripts/Items/Weapons/Artifacts/LegacyOfTheDreadLord.cs index e883cfa62..08854f764 100644 --- a/Scripts/Items/Weapons/Artifacts/LegacyOfTheDreadLord.cs +++ b/Scripts/Items/Weapons/Artifacts/LegacyOfTheDreadLord.cs @@ -5,11 +5,11 @@ namespace Server.Items { public class LegacyOfTheDreadLord : Bardiche { - public override int LabelNumber{ get{ return 1060860; } } // Legacy of the Dread Lord - public override int ArtifactRarity{ get{ return 10; } } + public override int LabelNumber => 1060860; // Legacy of the Dread Lord + public override int ArtifactRarity => 10; - public override int InitMinHits{ get{ return 255; } } - public override int InitMaxHits{ get{ return 255; } } + public override int InitMinHits => 255; + public override int InitMaxHits => 255; [Constructible] public LegacyOfTheDreadLord() @@ -31,7 +31,7 @@ namespace Server.Items writer.Write( (int) 0 ); } - + public override void Deserialize(GenericReader reader) { base.Deserialize( reader ); @@ -45,4 +45,4 @@ namespace Server.Items Hue = 0x676; } } -} \ No newline at end of file +} diff --git a/Scripts/Items/Weapons/Artifacts/SerpentsFang.cs b/Scripts/Items/Weapons/Artifacts/SerpentsFang.cs index 05865c6a7..07fb646d4 100644 --- a/Scripts/Items/Weapons/Artifacts/SerpentsFang.cs +++ b/Scripts/Items/Weapons/Artifacts/SerpentsFang.cs @@ -5,11 +5,11 @@ namespace Server.Items { public class SerpentsFang : Kryss { - public override int LabelNumber{ get{ return 1061601; } } // Serpent's Fang - public override int ArtifactRarity{ get{ return 11; } } + public override int LabelNumber => 1061601; // Serpent's Fang + public override int ArtifactRarity => 11; - public override int InitMinHits{ get{ return 255; } } - public override int InitMaxHits{ get{ return 255; } } + public override int InitMinHits => 255; + public override int InitMaxHits => 255; [Constructible] public SerpentsFang() @@ -39,7 +39,7 @@ namespace Server.Items writer.Write( (int) 0 ); } - + public override void Deserialize(GenericReader reader) { base.Deserialize( reader ); @@ -50,4 +50,4 @@ namespace Server.Items ItemID = 0x1400; } } -} \ No newline at end of file +} diff --git a/Scripts/Items/Weapons/Artifacts/StaffOfTheMagi.cs b/Scripts/Items/Weapons/Artifacts/StaffOfTheMagi.cs index 28e98cdec..f6be9d42a 100644 --- a/Scripts/Items/Weapons/Artifacts/StaffOfTheMagi.cs +++ b/Scripts/Items/Weapons/Artifacts/StaffOfTheMagi.cs @@ -5,11 +5,11 @@ namespace Server.Items { public class StaffOfTheMagi : BlackStaff { - public override int LabelNumber{ get{ return 1061600; } } // Staff of the Magi - public override int ArtifactRarity{ get{ return 11; } } + public override int LabelNumber => 1061600; // Staff of the Magi + public override int ArtifactRarity => 11; - public override int InitMinHits{ get{ return 255; } } - public override int InitMaxHits{ get{ return 255; } } + public override int InitMinHits => 255; + public override int InitMaxHits => 255; [Constructible] public StaffOfTheMagi() @@ -37,7 +37,7 @@ namespace Server.Items writer.Write( (int) 0 ); } - + public override void Deserialize(GenericReader reader) { base.Deserialize( reader ); @@ -51,4 +51,4 @@ namespace Server.Items ItemID = 0xDF0; } } -} \ No newline at end of file +} diff --git a/Scripts/Items/Weapons/Artifacts/TheBeserkersMaul.cs b/Scripts/Items/Weapons/Artifacts/TheBeserkersMaul.cs index ad62a64b9..f5412c940 100644 --- a/Scripts/Items/Weapons/Artifacts/TheBeserkersMaul.cs +++ b/Scripts/Items/Weapons/Artifacts/TheBeserkersMaul.cs @@ -5,11 +5,11 @@ namespace Server.Items { public class TheBeserkersMaul : Maul { - public override int LabelNumber{ get{ return 1061108; } } // The Berserker's Maul - public override int ArtifactRarity{ get{ return 11; } } + public override int LabelNumber => 1061108; // The Berserker's Maul + public override int ArtifactRarity => 11; - public override int InitMinHits{ get{ return 255; } } - public override int InitMaxHits{ get{ return 255; } } + public override int InitMinHits => 255; + public override int InitMaxHits => 255; [Constructible] public TheBeserkersMaul() @@ -29,7 +29,7 @@ namespace Server.Items writer.Write( (int) 0 ); } - + public override void Deserialize(GenericReader reader) { base.Deserialize( reader ); @@ -37,4 +37,4 @@ namespace Server.Items int version = reader.ReadInt(); } } -} \ No newline at end of file +} diff --git a/Scripts/Items/Weapons/Artifacts/TheDragonSlayer.cs b/Scripts/Items/Weapons/Artifacts/TheDragonSlayer.cs index 3e40a04be..5187abec9 100644 --- a/Scripts/Items/Weapons/Artifacts/TheDragonSlayer.cs +++ b/Scripts/Items/Weapons/Artifacts/TheDragonSlayer.cs @@ -5,11 +5,11 @@ namespace Server.Items { public class TheDragonSlayer : Lance { - public override int LabelNumber{ get{ return 1061248; } } // The Dragon Slayer - public override int ArtifactRarity{ get{ return 11; } } + public override int LabelNumber => 1061248; // The Dragon Slayer + public override int ArtifactRarity => 11; - public override int InitMinHits{ get{ return 255; } } - public override int InitMaxHits{ get{ return 255; } } + public override int InitMinHits => 255; + public override int InitMaxHits => 255; [Constructible] public TheDragonSlayer() @@ -38,7 +38,7 @@ namespace Server.Items writer.Write( (int) 0 ); } - + public override void Deserialize(GenericReader reader) { base.Deserialize( reader ); @@ -49,4 +49,4 @@ namespace Server.Items Slayer = SlayerName.DragonSlaying; } } -} \ No newline at end of file +} diff --git a/Scripts/Items/Weapons/Artifacts/TheDryadBow.cs b/Scripts/Items/Weapons/Artifacts/TheDryadBow.cs index ffd37be37..c80c46a54 100644 --- a/Scripts/Items/Weapons/Artifacts/TheDryadBow.cs +++ b/Scripts/Items/Weapons/Artifacts/TheDryadBow.cs @@ -5,11 +5,11 @@ namespace Server.Items { public class TheDryadBow : Bow { - public override int LabelNumber{ get{ return 1061090; } } // The Dryad Bow - public override int ArtifactRarity{ get{ return 11; } } + public override int LabelNumber => 1061090; // The Dryad Bow + public override int ArtifactRarity => 11; - public override int InitMinHits{ get{ return 255; } } - public override int InitMaxHits{ get{ return 255; } } + public override int InitMinHits => 255; + public override int InitMaxHits => 255; [Constructible] public TheDryadBow() @@ -43,7 +43,7 @@ namespace Server.Items writer.Write( (int) 1 ); } - + public override void Deserialize(GenericReader reader) { base.Deserialize( reader ); diff --git a/Scripts/Items/Weapons/Artifacts/TheTaskmaster.cs b/Scripts/Items/Weapons/Artifacts/TheTaskmaster.cs index 7cdb9cee4..7c83f3eae 100644 --- a/Scripts/Items/Weapons/Artifacts/TheTaskmaster.cs +++ b/Scripts/Items/Weapons/Artifacts/TheTaskmaster.cs @@ -5,11 +5,11 @@ namespace Server.Items { public class TheTaskmaster : WarFork { - public override int LabelNumber{ get{ return 1061110; } } // The Taskmaster - public override int ArtifactRarity{ get{ return 10; } } + public override int LabelNumber => 1061110; // The Taskmaster + public override int ArtifactRarity => 10; - public override int InitMinHits{ get{ return 255; } } - public override int InitMaxHits{ get{ return 255; } } + public override int InitMinHits => 255; + public override int InitMaxHits => 255; [Constructible] public TheTaskmaster() @@ -37,7 +37,7 @@ namespace Server.Items writer.Write( (int) 0 ); } - + public override void Deserialize(GenericReader reader) { base.Deserialize( reader ); @@ -45,4 +45,4 @@ namespace Server.Items int version = reader.ReadInt(); } } -} \ No newline at end of file +} diff --git a/Scripts/Items/Weapons/Artifacts/TitansHammer.cs b/Scripts/Items/Weapons/Artifacts/TitansHammer.cs index e9b97c4e7..17ad7dbb3 100644 --- a/Scripts/Items/Weapons/Artifacts/TitansHammer.cs +++ b/Scripts/Items/Weapons/Artifacts/TitansHammer.cs @@ -5,11 +5,11 @@ namespace Server.Items { public class TitansHammer : WarHammer { - public override int LabelNumber{ get{ return 1060024; } } // Titan's Hammer - public override int ArtifactRarity{ get{ return 10; } } + public override int LabelNumber => 1060024; // Titan's Hammer + public override int ArtifactRarity => 10; - public override int InitMinHits{ get{ return 255; } } - public override int InitMaxHits{ get{ return 255; } } + public override int InitMinHits => 255; + public override int InitMaxHits => 255; [Constructible] public TitansHammer() @@ -31,7 +31,7 @@ namespace Server.Items writer.Write( (int) 0 ); } - + public override void Deserialize(GenericReader reader) { base.Deserialize( reader ); @@ -39,4 +39,4 @@ namespace Server.Items int version = reader.ReadInt(); } } -} \ No newline at end of file +} diff --git a/Scripts/Items/Weapons/Artifacts/ZyronicClaw.cs b/Scripts/Items/Weapons/Artifacts/ZyronicClaw.cs index 81fa114ef..ca4ef9a7c 100644 --- a/Scripts/Items/Weapons/Artifacts/ZyronicClaw.cs +++ b/Scripts/Items/Weapons/Artifacts/ZyronicClaw.cs @@ -5,11 +5,11 @@ namespace Server.Items { public class ZyronicClaw : ExecutionersAxe { - public override int LabelNumber{ get{ return 1061593; } } // Zyronic Claw - public override int ArtifactRarity{ get{ return 10; } } + public override int LabelNumber => 1061593; // Zyronic Claw + public override int ArtifactRarity => 10; - public override int InitMinHits{ get{ return 255; } } - public override int InitMaxHits{ get{ return 255; } } + public override int InitMinHits => 255; + public override int InitMaxHits => 255; [Constructible] public ZyronicClaw() @@ -37,7 +37,7 @@ namespace Server.Items writer.Write( (int) 0 ); } - + public override void Deserialize(GenericReader reader) { base.Deserialize( reader ); @@ -48,4 +48,4 @@ namespace Server.Items Slayer = SlayerName.ElementalBan; } } -} \ No newline at end of file +} diff --git a/Scripts/Items/Weapons/Axes/Axe.cs b/Scripts/Items/Weapons/Axes/Axe.cs index 9c76d292e..2748113f9 100644 --- a/Scripts/Items/Weapons/Axes/Axe.cs +++ b/Scripts/Items/Weapons/Axes/Axe.cs @@ -7,22 +7,22 @@ namespace Server.Items [FlippableAttribute( 0xF49, 0xF4a )] public class Axe : BaseAxe { - public override WeaponAbility PrimaryAbility{ get{ return WeaponAbility.CrushingBlow; } } - public override WeaponAbility SecondaryAbility{ get{ return WeaponAbility.Dismount; } } + public override WeaponAbility PrimaryAbility => WeaponAbility.CrushingBlow; + public override WeaponAbility SecondaryAbility => WeaponAbility.Dismount; - public override int AosStrengthReq{ get{ return 35; } } - public override int AosMinDamage{ get{ return 14; } } - public override int AosMaxDamage{ get{ return 16; } } - public override int AosSpeed{ get{ return 37; } } - public override float MlSpeed{ get{ return 3.00f; } } + public override int AosStrengthReq => 35; + public override int AosMinDamage => 14; + public override int AosMaxDamage => 16; + public override int AosSpeed => 37; + public override float MlSpeed => 3.00f; - public override int OldStrengthReq{ get{ return 35; } } - public override int OldMinDamage{ get{ return 6; } } - public override int OldMaxDamage{ get{ return 33; } } - public override int OldSpeed{ get{ return 37; } } + public override int OldStrengthReq => 35; + public override int OldMinDamage => 6; + public override int OldMaxDamage => 33; + public override int OldSpeed => 37; - public override int InitMinHits{ get{ return 31; } } - public override int InitMaxHits{ get{ return 110; } } + public override int InitMinHits => 31; + public override int InitMaxHits => 110; [Constructible] public Axe() : base( 0xF49 ) @@ -48,4 +48,4 @@ namespace Server.Items int version = reader.ReadInt(); } } -} \ No newline at end of file +} diff --git a/Scripts/Items/Weapons/Axes/BaseAxe.cs b/Scripts/Items/Weapons/Axes/BaseAxe.cs index 9c1083dc1..3d055f002 100644 --- a/Scripts/Items/Weapons/Axes/BaseAxe.cs +++ b/Scripts/Items/Weapons/Axes/BaseAxe.cs @@ -16,12 +16,12 @@ namespace Server.Items public abstract class BaseAxe : BaseMeleeWeapon { - public override int DefHitSound{ get{ return 0x232; } } - public override int DefMissSound{ get{ return 0x23A; } } + public override int DefHitSound => 0x232; + public override int DefMissSound => 0x23A; - public override SkillName DefSkill{ get{ return SkillName.Swords; } } - public override WeaponType DefType{ get{ return WeaponType.Axe; } } - public override WeaponAnimation DefAnimation{ get{ return WeaponAnimation.Slash2H; } } + public override SkillName DefSkill => SkillName.Swords; + public override WeaponType DefType => WeaponType.Axe; + public override WeaponAnimation DefAnimation => WeaponAnimation.Slash2H; public virtual HarvestSystem HarvestSystem{ get{ return Lumberjacking.System; } } @@ -96,7 +96,7 @@ namespace Server.Items this.PublicOverheadMessage( MessageType.Regular, 0x3E9, 1061637 ); // You are not allowed to access this. return; } - + if ( !(this.HarvestSystem is Mining) ) from.SendLocalizedMessage( 1010018 ); // What do you want to use this item on? @@ -169,4 +169,4 @@ namespace Server.Items } } } -} \ No newline at end of file +} diff --git a/Scripts/Items/Weapons/Axes/BattleAxe.cs b/Scripts/Items/Weapons/Axes/BattleAxe.cs index 6f35d1855..f0d6fecb5 100644 --- a/Scripts/Items/Weapons/Axes/BattleAxe.cs +++ b/Scripts/Items/Weapons/Axes/BattleAxe.cs @@ -7,22 +7,22 @@ namespace Server.Items [FlippableAttribute( 0xF47, 0xF48 )] public class BattleAxe : BaseAxe { - public override WeaponAbility PrimaryAbility{ get{ return WeaponAbility.BleedAttack; } } - public override WeaponAbility SecondaryAbility{ get{ return WeaponAbility.ConcussionBlow; } } + public override WeaponAbility PrimaryAbility => WeaponAbility.BleedAttack; + public override WeaponAbility SecondaryAbility => WeaponAbility.ConcussionBlow; - public override int AosStrengthReq{ get{ return 35; } } - public override int AosMinDamage{ get{ return 15; } } - public override int AosMaxDamage{ get{ return 17; } } - public override int AosSpeed{ get{ return 31; } } - public override float MlSpeed{ get{ return 3.50f; } } + public override int AosStrengthReq => 35; + public override int AosMinDamage => 15; + public override int AosMaxDamage => 17; + public override int AosSpeed => 31; + public override float MlSpeed => 3.50f; - public override int OldStrengthReq{ get{ return 40; } } - public override int OldMinDamage{ get{ return 6; } } - public override int OldMaxDamage{ get{ return 38; } } - public override int OldSpeed{ get{ return 30; } } + public override int OldStrengthReq => 40; + public override int OldMinDamage => 6; + public override int OldMaxDamage => 38; + public override int OldSpeed => 30; - public override int InitMinHits{ get{ return 31; } } - public override int InitMaxHits{ get{ return 70; } } + public override int InitMinHits => 31; + public override int InitMaxHits => 70; [Constructible] public BattleAxe() : base( 0xF47 ) @@ -49,4 +49,4 @@ namespace Server.Items int version = reader.ReadInt(); } } -} \ No newline at end of file +} diff --git a/Scripts/Items/Weapons/Axes/DoubleAxe.cs b/Scripts/Items/Weapons/Axes/DoubleAxe.cs index fa68e701a..26fa2377c 100644 --- a/Scripts/Items/Weapons/Axes/DoubleAxe.cs +++ b/Scripts/Items/Weapons/Axes/DoubleAxe.cs @@ -7,22 +7,22 @@ namespace Server.Items [FlippableAttribute( 0xf4b, 0xf4c )] public class DoubleAxe : BaseAxe { - public override WeaponAbility PrimaryAbility{ get{ return WeaponAbility.DoubleStrike; } } - public override WeaponAbility SecondaryAbility{ get{ return WeaponAbility.WhirlwindAttack; } } + public override WeaponAbility PrimaryAbility => WeaponAbility.DoubleStrike; + public override WeaponAbility SecondaryAbility => WeaponAbility.WhirlwindAttack; - public override int AosStrengthReq{ get{ return 45; } } - public override int AosMinDamage{ get{ return 15; } } - public override int AosMaxDamage{ get{ return 17; } } - public override int AosSpeed{ get{ return 33; } } - public override float MlSpeed{ get{ return 3.25f; } } + public override int AosStrengthReq => 45; + public override int AosMinDamage => 15; + public override int AosMaxDamage => 17; + public override int AosSpeed => 33; + public override float MlSpeed => 3.25f; - public override int OldStrengthReq{ get{ return 45; } } - public override int OldMinDamage{ get{ return 5; } } - public override int OldMaxDamage{ get{ return 35; } } - public override int OldSpeed{ get{ return 37; } } + public override int OldStrengthReq => 45; + public override int OldMinDamage => 5; + public override int OldMaxDamage => 35; + public override int OldSpeed => 37; - public override int InitMinHits{ get{ return 31; } } - public override int InitMaxHits{ get{ return 110; } } + public override int InitMinHits => 31; + public override int InitMaxHits => 110; [Constructible] public DoubleAxe() : base( 0xF4B ) @@ -48,4 +48,4 @@ namespace Server.Items int version = reader.ReadInt(); } } -} \ No newline at end of file +} diff --git a/Scripts/Items/Weapons/Axes/ExecutionersAxe.cs b/Scripts/Items/Weapons/Axes/ExecutionersAxe.cs index 75abe1d6e..1833e9b6c 100644 --- a/Scripts/Items/Weapons/Axes/ExecutionersAxe.cs +++ b/Scripts/Items/Weapons/Axes/ExecutionersAxe.cs @@ -7,22 +7,22 @@ namespace Server.Items [FlippableAttribute( 0xf45, 0xf46 )] public class ExecutionersAxe : BaseAxe { - public override WeaponAbility PrimaryAbility{ get{ return WeaponAbility.BleedAttack; } } - public override WeaponAbility SecondaryAbility{ get{ return WeaponAbility.MortalStrike; } } + public override WeaponAbility PrimaryAbility => WeaponAbility.BleedAttack; + public override WeaponAbility SecondaryAbility => WeaponAbility.MortalStrike; - public override int AosStrengthReq{ get{ return 40; } } - public override int AosMinDamage{ get{ return 15; } } - public override int AosMaxDamage{ get{ return 17; } } - public override int AosSpeed{ get{ return 33; } } - public override float MlSpeed{ get{ return 3.25f; } } + public override int AosStrengthReq => 40; + public override int AosMinDamage => 15; + public override int AosMaxDamage => 17; + public override int AosSpeed => 33; + public override float MlSpeed => 3.25f; - public override int OldStrengthReq{ get{ return 35; } } - public override int OldMinDamage{ get{ return 6; } } - public override int OldMaxDamage{ get{ return 33; } } - public override int OldSpeed{ get{ return 37; } } + public override int OldStrengthReq => 35; + public override int OldMinDamage => 6; + public override int OldMaxDamage => 33; + public override int OldSpeed => 37; - public override int InitMinHits{ get{ return 31; } } - public override int InitMaxHits{ get{ return 70; } } + public override int InitMinHits => 31; + public override int InitMaxHits => 70; [Constructible] public ExecutionersAxe() : base( 0xF45 ) @@ -48,4 +48,4 @@ namespace Server.Items int version = reader.ReadInt(); } } -} \ No newline at end of file +} diff --git a/Scripts/Items/Weapons/Axes/GuardianAxe.cs b/Scripts/Items/Weapons/Axes/GuardianAxe.cs index 5ccf3ce35..3a014596b 100644 --- a/Scripts/Items/Weapons/Axes/GuardianAxe.cs +++ b/Scripts/Items/Weapons/Axes/GuardianAxe.cs @@ -5,7 +5,7 @@ namespace Server.Items { public class GuardianAxe : OrnateAxe { - public override int LabelNumber{ get{ return 1073545; } } // guardian axe + public override int LabelNumber => 1073545; // guardian axe [Constructible] public GuardianAxe() diff --git a/Scripts/Items/Weapons/Axes/Hatchet.cs b/Scripts/Items/Weapons/Axes/Hatchet.cs index 890690034..98a84dd88 100644 --- a/Scripts/Items/Weapons/Axes/Hatchet.cs +++ b/Scripts/Items/Weapons/Axes/Hatchet.cs @@ -7,22 +7,22 @@ namespace Server.Items [FlippableAttribute( 0xF43, 0xF44 )] public class Hatchet : BaseAxe { - public override WeaponAbility PrimaryAbility{ get{ return WeaponAbility.ArmorIgnore; } } - public override WeaponAbility SecondaryAbility{ get{ return WeaponAbility.Disarm; } } + public override WeaponAbility PrimaryAbility => WeaponAbility.ArmorIgnore; + public override WeaponAbility SecondaryAbility => WeaponAbility.Disarm; - public override int AosStrengthReq{ get{ return 20; } } - public override int AosMinDamage{ get{ return 13; } } - public override int AosMaxDamage{ get{ return 15; } } - public override int AosSpeed{ get{ return 41; } } - public override float MlSpeed{ get{ return 2.75f; } } + public override int AosStrengthReq => 20; + public override int AosMinDamage => 13; + public override int AosMaxDamage => 15; + public override int AosSpeed => 41; + public override float MlSpeed => 2.75f; - public override int OldStrengthReq{ get{ return 15; } } - public override int OldMinDamage{ get{ return 2; } } - public override int OldMaxDamage{ get{ return 17; } } - public override int OldSpeed{ get{ return 40; } } + public override int OldStrengthReq => 15; + public override int OldMinDamage => 2; + public override int OldMaxDamage => 17; + public override int OldSpeed => 40; - public override int InitMinHits{ get{ return 31; } } - public override int InitMaxHits{ get{ return 80; } } + public override int InitMinHits => 31; + public override int InitMaxHits => 80; [Constructible] public Hatchet() : base( 0xF43 ) @@ -48,4 +48,4 @@ namespace Server.Items int version = reader.ReadInt(); } } -} \ No newline at end of file +} diff --git a/Scripts/Items/Weapons/Axes/HeavyOrnateAxe.cs b/Scripts/Items/Weapons/Axes/HeavyOrnateAxe.cs index 0d93a7488..2327b1e24 100644 --- a/Scripts/Items/Weapons/Axes/HeavyOrnateAxe.cs +++ b/Scripts/Items/Weapons/Axes/HeavyOrnateAxe.cs @@ -5,7 +5,7 @@ namespace Server.Items { public class HeavyOrnateAxe : OrnateAxe { - public override int LabelNumber{ get{ return 1073548; } } // heavy ornate axe + public override int LabelNumber => 1073548; // heavy ornate axe [Constructible] public HeavyOrnateAxe() diff --git a/Scripts/Items/Weapons/Axes/LargeBattleAxe.cs b/Scripts/Items/Weapons/Axes/LargeBattleAxe.cs index 961f940a1..5a37b25dd 100644 --- a/Scripts/Items/Weapons/Axes/LargeBattleAxe.cs +++ b/Scripts/Items/Weapons/Axes/LargeBattleAxe.cs @@ -7,22 +7,22 @@ namespace Server.Items [FlippableAttribute( 0x13FB, 0x13FA )] public class LargeBattleAxe : BaseAxe { - public override WeaponAbility PrimaryAbility{ get{ return WeaponAbility.WhirlwindAttack; } } - public override WeaponAbility SecondaryAbility{ get{ return WeaponAbility.BleedAttack; } } + public override WeaponAbility PrimaryAbility => WeaponAbility.WhirlwindAttack; + public override WeaponAbility SecondaryAbility => WeaponAbility.BleedAttack; - public override int AosStrengthReq{ get{ return 80; } } - public override int AosMinDamage{ get{ return 16; } } - public override int AosMaxDamage{ get{ return 17; } } - public override int AosSpeed{ get{ return 29; } } - public override float MlSpeed{ get{ return 3.75f; } } + public override int AosStrengthReq => 80; + public override int AosMinDamage => 16; + public override int AosMaxDamage => 17; + public override int AosSpeed => 29; + public override float MlSpeed => 3.75f; - public override int OldStrengthReq{ get{ return 40; } } - public override int OldMinDamage{ get{ return 6; } } - public override int OldMaxDamage{ get{ return 38; } } - public override int OldSpeed{ get{ return 30; } } + public override int OldStrengthReq => 40; + public override int OldMinDamage => 6; + public override int OldMaxDamage => 38; + public override int OldSpeed => 30; - public override int InitMinHits{ get{ return 31; } } - public override int InitMaxHits{ get{ return 70; } } + public override int InitMinHits => 31; + public override int InitMaxHits => 70; [Constructible] public LargeBattleAxe() : base( 0x13FB ) @@ -48,4 +48,4 @@ namespace Server.Items int version = reader.ReadInt(); } } -} \ No newline at end of file +} diff --git a/Scripts/Items/Weapons/Axes/Pickaxe.cs b/Scripts/Items/Weapons/Axes/Pickaxe.cs index 0fa0d2b0e..dc7bc400e 100644 --- a/Scripts/Items/Weapons/Axes/Pickaxe.cs +++ b/Scripts/Items/Weapons/Axes/Pickaxe.cs @@ -8,26 +8,26 @@ namespace Server.Items [FlippableAttribute( 0xE86, 0xE85 )] public class Pickaxe : BaseAxe, IUsesRemaining { - public override HarvestSystem HarvestSystem{ get{ return Mining.System; } } + public override HarvestSystem HarvestSystem => Mining.System; - public override WeaponAbility PrimaryAbility{ get{ return WeaponAbility.DoubleStrike; } } - public override WeaponAbility SecondaryAbility{ get{ return WeaponAbility.Disarm; } } + public override WeaponAbility PrimaryAbility => WeaponAbility.DoubleStrike; + public override WeaponAbility SecondaryAbility => WeaponAbility.Disarm; - public override int AosStrengthReq{ get{ return 50; } } - public override int AosMinDamage{ get{ return 13; } } - public override int AosMaxDamage{ get{ return 15; } } - public override int AosSpeed{ get{ return 35; } } - public override float MlSpeed{ get{ return 3.00f; } } + public override int AosStrengthReq => 50; + public override int AosMinDamage => 13; + public override int AosMaxDamage => 15; + public override int AosSpeed => 35; + public override float MlSpeed => 3.00f; - public override int OldStrengthReq{ get{ return 25; } } - public override int OldMinDamage{ get{ return 1; } } - public override int OldMaxDamage{ get{ return 15; } } - public override int OldSpeed{ get{ return 35; } } + public override int OldStrengthReq => 25; + public override int OldMinDamage => 1; + public override int OldMaxDamage => 15; + public override int OldSpeed => 35; - public override int InitMinHits{ get{ return 31; } } - public override int InitMaxHits{ get{ return 60; } } + public override int InitMinHits => 31; + public override int InitMaxHits => 60; - public override WeaponAnimation DefAnimation{ get{ return WeaponAnimation.Slash1H; } } + public override WeaponAnimation DefAnimation => WeaponAnimation.Slash1H; [Constructible] public Pickaxe() : base( 0xE86 ) @@ -56,4 +56,4 @@ namespace Server.Items ShowUsesRemaining = true; } } -} \ No newline at end of file +} diff --git a/Scripts/Items/Weapons/Axes/SingingAxe.cs b/Scripts/Items/Weapons/Axes/SingingAxe.cs index 49eef3011..652128ddf 100644 --- a/Scripts/Items/Weapons/Axes/SingingAxe.cs +++ b/Scripts/Items/Weapons/Axes/SingingAxe.cs @@ -5,7 +5,7 @@ namespace Server.Items { public class SingingAxe : OrnateAxe { - public override int LabelNumber{ get{ return 1073546; } } // singing axe + public override int LabelNumber => 1073546; // singing axe [Constructible] public SingingAxe() diff --git a/Scripts/Items/Weapons/Axes/ThunderingAxe.cs b/Scripts/Items/Weapons/Axes/ThunderingAxe.cs index d66d93dbb..a337c3aaa 100644 --- a/Scripts/Items/Weapons/Axes/ThunderingAxe.cs +++ b/Scripts/Items/Weapons/Axes/ThunderingAxe.cs @@ -5,7 +5,7 @@ namespace Server.Items { public class ThunderingAxe : OrnateAxe { - public override int LabelNumber{ get{ return 1073547; } } // thundering axe + public override int LabelNumber => 1073547; // thundering axe [Constructible] public ThunderingAxe() diff --git a/Scripts/Items/Weapons/Axes/TwoHandedAxe.cs b/Scripts/Items/Weapons/Axes/TwoHandedAxe.cs index 16f5fbd04..08ad2e0ce 100644 --- a/Scripts/Items/Weapons/Axes/TwoHandedAxe.cs +++ b/Scripts/Items/Weapons/Axes/TwoHandedAxe.cs @@ -7,22 +7,22 @@ namespace Server.Items [FlippableAttribute( 0x1443, 0x1442 )] public class TwoHandedAxe : BaseAxe { - public override WeaponAbility PrimaryAbility{ get{ return WeaponAbility.DoubleStrike; } } - public override WeaponAbility SecondaryAbility{ get{ return WeaponAbility.ShadowStrike; } } + public override WeaponAbility PrimaryAbility => WeaponAbility.DoubleStrike; + public override WeaponAbility SecondaryAbility => WeaponAbility.ShadowStrike; - public override int AosStrengthReq{ get{ return 40; } } - public override int AosMinDamage{ get{ return 16; } } - public override int AosMaxDamage{ get{ return 17; } } - public override int AosSpeed{ get{ return 31; } } - public override float MlSpeed{ get{ return 3.50f; } } + public override int AosStrengthReq => 40; + public override int AosMinDamage => 16; + public override int AosMaxDamage => 17; + public override int AosSpeed => 31; + public override float MlSpeed => 3.50f; - public override int OldStrengthReq{ get{ return 35; } } - public override int OldMinDamage{ get{ return 5; } } - public override int OldMaxDamage{ get{ return 39; } } - public override int OldSpeed{ get{ return 30; } } + public override int OldStrengthReq => 35; + public override int OldMinDamage => 5; + public override int OldMaxDamage => 39; + public override int OldSpeed => 30; - public override int InitMinHits{ get{ return 31; } } - public override int InitMaxHits{ get{ return 90; } } + public override int InitMinHits => 31; + public override int InitMaxHits => 90; [Constructible] public TwoHandedAxe() : base( 0x1443 ) @@ -48,4 +48,4 @@ namespace Server.Items int version = reader.ReadInt(); } } -} \ No newline at end of file +} diff --git a/Scripts/Items/Weapons/Axes/WarAxe.cs b/Scripts/Items/Weapons/Axes/WarAxe.cs index 888564d1a..e3a78569d 100644 --- a/Scripts/Items/Weapons/Axes/WarAxe.cs +++ b/Scripts/Items/Weapons/Axes/WarAxe.cs @@ -8,31 +8,31 @@ namespace Server.Items [FlippableAttribute( 0x13B0, 0x13AF )] public class WarAxe : BaseAxe { - public override WeaponAbility PrimaryAbility{ get{ return WeaponAbility.ArmorIgnore; } } - public override WeaponAbility SecondaryAbility{ get{ return WeaponAbility.BleedAttack; } } + public override WeaponAbility PrimaryAbility => WeaponAbility.ArmorIgnore; + public override WeaponAbility SecondaryAbility => WeaponAbility.BleedAttack; - public override int AosStrengthReq{ get{ return 35; } } - public override int AosMinDamage{ get{ return 14; } } - public override int AosMaxDamage{ get{ return 15; } } - public override int AosSpeed{ get{ return 33; } } - public override float MlSpeed{ get{ return 3.25f; } } + public override int AosStrengthReq => 35; + public override int AosMinDamage => 14; + public override int AosMaxDamage => 15; + public override int AosSpeed => 33; + public override float MlSpeed => 3.25f; - public override int OldStrengthReq{ get{ return 35; } } - public override int OldMinDamage{ get{ return 9; } } - public override int OldMaxDamage{ get{ return 27; } } - public override int OldSpeed{ get{ return 40; } } + public override int OldStrengthReq => 35; + public override int OldMinDamage => 9; + public override int OldMaxDamage => 27; + public override int OldSpeed => 40; - public override int DefHitSound{ get{ return 0x233; } } - public override int DefMissSound{ get{ return 0x239; } } + public override int DefHitSound => 0x233; + public override int DefMissSound => 0x239; - public override int InitMinHits{ get{ return 31; } } - public override int InitMaxHits{ get{ return 80; } } + public override int InitMinHits => 31; + public override int InitMaxHits => 80; - public override SkillName DefSkill{ get{ return SkillName.Macing; } } - public override WeaponType DefType{ get{ return WeaponType.Bashing; } } - public override WeaponAnimation DefAnimation{ get{ return WeaponAnimation.Bash1H; } } + public override SkillName DefSkill => SkillName.Macing; + public override WeaponType DefType => WeaponType.Bashing; + public override WeaponAnimation DefAnimation => WeaponAnimation.Bash1H; - public override HarvestSystem HarvestSystem{ get{ return null; } } + public override HarvestSystem HarvestSystem => null; [Constructible] public WarAxe() : base( 0x13B0 ) @@ -58,4 +58,4 @@ namespace Server.Items int version = reader.ReadInt(); } } -} \ No newline at end of file +} diff --git a/Scripts/Items/Weapons/BaseWeapon.cs b/Scripts/Items/Weapons/BaseWeapon.cs index 1bf3039c1..aac519c99 100644 --- a/Scripts/Items/Weapons/BaseWeapon.cs +++ b/Scripts/Items/Weapons/BaseWeapon.cs @@ -24,7 +24,7 @@ namespace Server.Items public abstract class BaseWeapon : Item, IWeapon, IFactionItem, ICraftable, ISlayer, IDurability { private string m_EngravedText; - + [CommandProperty( AccessLevel.GameMaster )] public string EngravedText { @@ -51,7 +51,7 @@ namespace Server.Items #endregion /* Weapon internals work differently now (Mar 13 2003) - * + * * The attributes defined below default to -1. * If the value is -1, the corresponding virtual 'Aos/Old' property is used. * If not, the attribute value itself is used. Here's the list: @@ -147,13 +147,13 @@ namespace Server.Items public virtual bool CanFortify{ get{ return true; } } - public override int PhysicalResistance{ get{ return m_AosWeaponAttributes.ResistPhysicalBonus; } } - public override int FireResistance{ get{ return m_AosWeaponAttributes.ResistFireBonus; } } - public override int ColdResistance{ get{ return m_AosWeaponAttributes.ResistColdBonus; } } - public override int PoisonResistance{ get{ return m_AosWeaponAttributes.ResistPoisonBonus; } } - public override int EnergyResistance{ get{ return m_AosWeaponAttributes.ResistEnergyBonus; } } + public override int PhysicalResistance => m_AosWeaponAttributes.ResistPhysicalBonus; + public override int FireResistance => m_AosWeaponAttributes.ResistFireBonus; + public override int ColdResistance => m_AosWeaponAttributes.ResistColdBonus; + public override int PoisonResistance => m_AosWeaponAttributes.ResistPoisonBonus; + public override int EnergyResistance => m_AosWeaponAttributes.ResistEnergyBonus; - public virtual SkillName AccuracySkill { get { return SkillName.Tactics; } } + public virtual SkillName AccuracySkill => SkillName.Tactics; #endregion #region Getters & Setters @@ -311,7 +311,7 @@ namespace Server.Items [CommandProperty( AccessLevel.GameMaster )] public WeaponAnimation Animation { - get{ return ( m_Animation == (WeaponAnimation)(-1) ? Core.AOS ? AosAnimation : OldAnimation : m_Animation ); } + get{ return ( m_Animation == (WeaponAnimation)(-1) ? Core.AOS ? AosAnimation : OldAnimation : m_Animation ); } set{ m_Animation = value; } } @@ -571,7 +571,7 @@ namespace Server.Items return base.AllowSecureTrade( from, to, newOwner, accepted ); } - public virtual Race RequiredRace { get { return null; } } //On OSI, there are no weapons with race requirements, this is for custom stuff + public virtual Race RequiredRace => null; //On OSI, there are no weapons with race requirements, this is for custom stuff public override bool CanEquip( Mobile from ) { @@ -591,7 +591,7 @@ namespace Server.Items { from.SendMessage( "You are not nimble enough to equip that." ); return false; - } + } else if ( from.Str < AOS.Scale( StrRequirement, 100 - GetLowerStatReq() ) ) { from.SendLocalizedMessage( 500213 ); // You are not strong enough to equip that. @@ -821,7 +821,7 @@ namespace Server.Items if ( HitLower.IsUnderDefenseEffect( defender ) ) bonus -= 25; // Under Hit Lower Defense effect -> 25% malus - + int blockBonus = 0; if ( Block.GetBonus( defender, ref blockBonus ) ) @@ -915,7 +915,7 @@ namespace Server.Items if ( bonus > 60 ) bonus = 60; - + double ticks; if ( Core.ML ) @@ -934,7 +934,7 @@ namespace Server.Items ticks = Math.Floor( ( 80000.0 / ( ( m.Stam + 100 ) * speed ) ) - 2 ); } - + // Swing speed currently capped at one swing every 1.25 seconds (5 ticks). if ( ticks < 5 ) ticks = 5; @@ -963,7 +963,7 @@ namespace Server.Items delayInSeconds = Math.Floor( 40000.0 / v ) * 0.5; - // Maximum swing rate capped at one swing per second + // Maximum swing rate capped at one swing per second // OSI dev said that it has and is supposed to be 1.25 if ( delayInSeconds < 1.25 ) delayInSeconds = 1.25; @@ -1108,7 +1108,7 @@ namespace Server.Items double chance = (parry - bushidoNonRacial) / 400.0; // As per OSI, no genitive effect from the Racial stuffs, ie, 120 parry and '0' bushido with humans if ( chance < 0 ) // chance shouldn't go below 0 - chance = 0; + chance = 0; // Parry/Bushido over 100 grants a 5% bonus. if ( parry >= 100.0 || bushido >= 100.0) @@ -1514,7 +1514,7 @@ namespace Server.Items damage = 1; else if ( Core.AOS && damage == 0 ) // parried { - if ( a != null && a.Validate( attacker ) /*&& a.CheckMana( attacker, true )*/ ) // Parried special moves have no mana cost + if ( a != null && a.Validate( attacker ) /*&& a.CheckMana( attacker, true )*/ ) // Parried special moves have no mana cost { a = null; WeaponAbility.ClearCurrentAbility( attacker ); @@ -3079,16 +3079,16 @@ namespace Server.Items list.Add( LabelNumber ); else list.Add( Name ); - + /* - * Want to move this to the engraving tool, let the non-harmful + * Want to move this to the engraving tool, let the non-harmful * formatting show, and remove CLILOCs embedded: more like OSI * did with the books that had markup, etc. - * - * This will have a negative effect on a few event things imgame + * + * This will have a negative effect on a few event things imgame * as is. - * - * If we cant find a more OSI-ish way to clean it up, we can + * + * If we cant find a more OSI-ish way to clean it up, we can * easily put this back, and use it in the deserialize * method and engraving tool, to make it perm cleaned up. */ diff --git a/Scripts/Items/Weapons/Fists.cs b/Scripts/Items/Weapons/Fists.cs index 6dc7fa11f..a588d47c3 100644 --- a/Scripts/Items/Weapons/Fists.cs +++ b/Scripts/Items/Weapons/Fists.cs @@ -14,26 +14,26 @@ namespace Server.Items EventSink.StunRequest += new StunRequestEventHandler( EventSink_StunRequest ); } - public override WeaponAbility PrimaryAbility{ get{ return WeaponAbility.Disarm; } } - public override WeaponAbility SecondaryAbility{ get{ return WeaponAbility.ParalyzingBlow; } } + public override WeaponAbility PrimaryAbility => WeaponAbility.Disarm; + public override WeaponAbility SecondaryAbility => WeaponAbility.ParalyzingBlow; - public override int AosStrengthReq{ get{ return 0; } } - public override int AosMinDamage{ get{ return 1; } } - public override int AosMaxDamage{ get{ return 4; } } - public override int AosSpeed{ get{ return 50; } } - public override float MlSpeed{ get{ return 2.50f; } } + public override int AosStrengthReq => 0; + public override int AosMinDamage => 1; + public override int AosMaxDamage => 4; + public override int AosSpeed => 50; + public override float MlSpeed => 2.50f; - public override int OldStrengthReq{ get{ return 0; } } - public override int OldMinDamage{ get{ return 1; } } - public override int OldMaxDamage{ get{ return 8; } } - public override int OldSpeed{ get{ return 30; } } + public override int OldStrengthReq => 0; + public override int OldMinDamage => 1; + public override int OldMaxDamage => 8; + public override int OldSpeed => 30; - public override int DefHitSound{ get{ return -1; } } - public override int DefMissSound{ get{ return -1; } } + public override int DefHitSound => -1; + public override int DefMissSound => -1; - public override SkillName DefSkill{ get{ return SkillName.Wrestling; } } - public override WeaponType DefType{ get{ return WeaponType.Fists; } } - public override WeaponAnimation DefAnimation{ get{ return WeaponAnimation.Wrestle; } } + public override SkillName DefSkill => SkillName.Wrestling; + public override WeaponType DefType => WeaponType.Fists; + public override WeaponAnimation DefAnimation => WeaponAnimation.Wrestle; public Fists() : base( 0 ) { @@ -309,4 +309,4 @@ namespace Server.Items new MoveDelayTimer( m ).Start(); } } -} \ No newline at end of file +} diff --git a/Scripts/Items/Weapons/Knives/BaseKnife.cs b/Scripts/Items/Weapons/Knives/BaseKnife.cs index 965929202..b992e9f82 100644 --- a/Scripts/Items/Weapons/Knives/BaseKnife.cs +++ b/Scripts/Items/Weapons/Knives/BaseKnife.cs @@ -7,12 +7,12 @@ namespace Server.Items { public abstract class BaseKnife : BaseMeleeWeapon { - public override int DefHitSound{ get{ return 0x23B; } } - public override int DefMissSound{ get{ return 0x238; } } + public override int DefHitSound => 0x23B; + public override int DefMissSound => 0x238; - public override SkillName DefSkill{ get{ return SkillName.Swords; } } - public override WeaponType DefType{ get{ return WeaponType.Slashing; } } - public override WeaponAnimation DefAnimation{ get{ return WeaponAnimation.Slash1H; } } + public override SkillName DefSkill => SkillName.Swords; + public override WeaponType DefType => WeaponType.Slashing; + public override WeaponAnimation DefAnimation => WeaponAnimation.Slash1H; public BaseKnife( int itemID ) : base( itemID ) { @@ -56,4 +56,4 @@ namespace Server.Items } } } -} \ No newline at end of file +} diff --git a/Scripts/Items/Weapons/Knives/ButcherKnife.cs b/Scripts/Items/Weapons/Knives/ButcherKnife.cs index c6f9977ea..ec54e8adc 100644 --- a/Scripts/Items/Weapons/Knives/ButcherKnife.cs +++ b/Scripts/Items/Weapons/Knives/ButcherKnife.cs @@ -7,22 +7,22 @@ namespace Server.Items [FlippableAttribute( 0x13F6, 0x13F7 )] public class ButcherKnife : BaseKnife { - public override WeaponAbility PrimaryAbility{ get{ return WeaponAbility.InfectiousStrike; } } - public override WeaponAbility SecondaryAbility{ get{ return WeaponAbility.Disarm; } } + public override WeaponAbility PrimaryAbility => WeaponAbility.InfectiousStrike; + public override WeaponAbility SecondaryAbility => WeaponAbility.Disarm; - public override int AosStrengthReq{ get{ return 5; } } - public override int AosMinDamage{ get{ return 9; } } - public override int AosMaxDamage{ get{ return 11; } } - public override int AosSpeed{ get{ return 49; } } - public override float MlSpeed{ get{ return 2.25f; } } + public override int AosStrengthReq => 5; + public override int AosMinDamage => 9; + public override int AosMaxDamage => 11; + public override int AosSpeed => 49; + public override float MlSpeed => 2.25f; - public override int OldStrengthReq{ get{ return 5; } } - public override int OldMinDamage{ get{ return 2; } } - public override int OldMaxDamage{ get{ return 14; } } - public override int OldSpeed{ get{ return 40; } } + public override int OldStrengthReq => 5; + public override int OldMinDamage => 2; + public override int OldMaxDamage => 14; + public override int OldSpeed => 40; - public override int InitMinHits{ get{ return 31; } } - public override int InitMaxHits{ get{ return 40; } } + public override int InitMinHits => 31; + public override int InitMaxHits => 40; [Constructible] public ButcherKnife() : base( 0x13F6 ) @@ -48,4 +48,4 @@ namespace Server.Items int version = reader.ReadInt(); } } -} \ No newline at end of file +} diff --git a/Scripts/Items/Weapons/Knives/Cleaver.cs b/Scripts/Items/Weapons/Knives/Cleaver.cs index c82715214..e64a68853 100644 --- a/Scripts/Items/Weapons/Knives/Cleaver.cs +++ b/Scripts/Items/Weapons/Knives/Cleaver.cs @@ -7,22 +7,22 @@ namespace Server.Items [FlippableAttribute( 0xEC3, 0xEC2 )] public class Cleaver : BaseKnife { - public override WeaponAbility PrimaryAbility{ get{ return WeaponAbility.BleedAttack; } } - public override WeaponAbility SecondaryAbility{ get{ return WeaponAbility.InfectiousStrike; } } + public override WeaponAbility PrimaryAbility => WeaponAbility.BleedAttack; + public override WeaponAbility SecondaryAbility => WeaponAbility.InfectiousStrike; - public override int AosStrengthReq{ get{ return 10; } } - public override int AosMinDamage{ get{ return 11; } } - public override int AosMaxDamage{ get{ return 13; } } - public override int AosSpeed{ get{ return 46; } } - public override float MlSpeed{ get{ return 2.50f; } } + public override int AosStrengthReq => 10; + public override int AosMinDamage => 11; + public override int AosMaxDamage => 13; + public override int AosSpeed => 46; + public override float MlSpeed => 2.50f; - public override int OldStrengthReq{ get{ return 10; } } - public override int OldMinDamage{ get{ return 2; } } - public override int OldMaxDamage{ get{ return 13; } } - public override int OldSpeed{ get{ return 40; } } + public override int OldStrengthReq => 10; + public override int OldMinDamage => 2; + public override int OldMaxDamage => 13; + public override int OldSpeed => 40; - public override int InitMinHits{ get{ return 31; } } - public override int InitMaxHits{ get{ return 50; } } + public override int InitMinHits => 31; + public override int InitMaxHits => 50; [Constructible] public Cleaver() : base( 0xEC3 ) @@ -51,4 +51,4 @@ namespace Server.Items Weight = 2.0; } } -} \ No newline at end of file +} diff --git a/Scripts/Items/Weapons/Knives/Dagger.cs b/Scripts/Items/Weapons/Knives/Dagger.cs index bf1c73409..6c8b9bdad 100644 --- a/Scripts/Items/Weapons/Knives/Dagger.cs +++ b/Scripts/Items/Weapons/Knives/Dagger.cs @@ -8,26 +8,26 @@ namespace Server.Items [FlippableAttribute( 0xF52, 0xF51 )] public class Dagger : BaseKnife { - public override WeaponAbility PrimaryAbility{ get{ return WeaponAbility.InfectiousStrike; } } - public override WeaponAbility SecondaryAbility{ get{ return WeaponAbility.ShadowStrike; } } + public override WeaponAbility PrimaryAbility => WeaponAbility.InfectiousStrike; + public override WeaponAbility SecondaryAbility => WeaponAbility.ShadowStrike; - public override int AosStrengthReq{ get{ return 10; } } - public override int AosMinDamage{ get{ return 10; } } - public override int AosMaxDamage{ get{ return 11; } } - public override int AosSpeed{ get{ return 56; } } - public override float MlSpeed{ get{ return 2.00f; } } + public override int AosStrengthReq => 10; + public override int AosMinDamage => 10; + public override int AosMaxDamage => 11; + public override int AosSpeed => 56; + public override float MlSpeed => 2.00f; - public override int OldStrengthReq{ get{ return 1; } } - public override int OldMinDamage{ get{ return 3; } } - public override int OldMaxDamage{ get{ return 15; } } - public override int OldSpeed{ get{ return 55; } } + public override int OldStrengthReq => 1; + public override int OldMinDamage => 3; + public override int OldMaxDamage => 15; + public override int OldSpeed => 55; - public override int InitMinHits{ get{ return 31; } } - public override int InitMaxHits{ get{ return 40; } } + public override int InitMinHits => 31; + public override int InitMaxHits => 40; - public override SkillName DefSkill{ get{ return SkillName.Fencing; } } - public override WeaponType DefType{ get{ return WeaponType.Piercing; } } - public override WeaponAnimation DefAnimation{ get{ return WeaponAnimation.Pierce1H; } } + public override SkillName DefSkill => SkillName.Fencing; + public override WeaponType DefType => WeaponType.Piercing; + public override WeaponAnimation DefAnimation => WeaponAnimation.Pierce1H; [Constructible] public Dagger() : base( 0xF52 ) @@ -53,4 +53,4 @@ namespace Server.Items int version = reader.ReadInt(); } } -} \ No newline at end of file +} diff --git a/Scripts/Items/Weapons/Knives/SkinningKnife.cs b/Scripts/Items/Weapons/Knives/SkinningKnife.cs index 4260d4a11..d352a1ac6 100644 --- a/Scripts/Items/Weapons/Knives/SkinningKnife.cs +++ b/Scripts/Items/Weapons/Knives/SkinningKnife.cs @@ -7,22 +7,22 @@ namespace Server.Items [FlippableAttribute( 0xEC4, 0xEC5 )] public class SkinningKnife : BaseKnife { - public override WeaponAbility PrimaryAbility{ get{ return WeaponAbility.ShadowStrike; } } - public override WeaponAbility SecondaryAbility{ get{ return WeaponAbility.Disarm; } } + public override WeaponAbility PrimaryAbility => WeaponAbility.ShadowStrike; + public override WeaponAbility SecondaryAbility => WeaponAbility.Disarm; - public override int AosStrengthReq{ get{ return 5; } } - public override int AosMinDamage{ get{ return 9; } } - public override int AosMaxDamage{ get{ return 11; } } - public override int AosSpeed{ get{ return 49; } } - public override float MlSpeed{ get{ return 2.25f; } } + public override int AosStrengthReq => 5; + public override int AosMinDamage => 9; + public override int AosMaxDamage => 11; + public override int AosSpeed => 49; + public override float MlSpeed => 2.25f; - public override int OldStrengthReq{ get{ return 5; } } - public override int OldMinDamage{ get{ return 1; } } - public override int OldMaxDamage{ get{ return 10; } } - public override int OldSpeed{ get{ return 40; } } + public override int OldStrengthReq => 5; + public override int OldMinDamage => 1; + public override int OldMaxDamage => 10; + public override int OldSpeed => 40; - public override int InitMinHits{ get{ return 31; } } - public override int InitMaxHits{ get{ return 40; } } + public override int InitMinHits => 31; + public override int InitMaxHits => 40; [Constructible] public SkinningKnife() : base( 0xEC4 ) @@ -48,4 +48,4 @@ namespace Server.Items int version = reader.ReadInt(); } } -} \ No newline at end of file +} diff --git a/Scripts/Items/Weapons/ML Weapons/Artifacts/BlightGrippedLongbow.cs b/Scripts/Items/Weapons/ML Weapons/Artifacts/BlightGrippedLongbow.cs index 4b7073c51..d5649fd5e 100644 --- a/Scripts/Items/Weapons/ML Weapons/Artifacts/BlightGrippedLongbow.cs +++ b/Scripts/Items/Weapons/ML Weapons/Artifacts/BlightGrippedLongbow.cs @@ -5,7 +5,7 @@ namespace Server.Items { public class BlightGrippedLongbow : ElvenCompositeLongbow { - public override int LabelNumber{ get{ return 1072907; } } // Blight Gripped Longbow + public override int LabelNumber => 1072907; // Blight Gripped Longbow [Constructible] public BlightGrippedLongbow() @@ -37,4 +37,4 @@ namespace Server.Items int version = reader.ReadEncodedInt(); } } -} \ No newline at end of file +} diff --git a/Scripts/Items/Weapons/ML Weapons/Artifacts/ColdForgedBlade.cs b/Scripts/Items/Weapons/ML Weapons/Artifacts/ColdForgedBlade.cs index 28955689d..b33c25503 100644 --- a/Scripts/Items/Weapons/ML Weapons/Artifacts/ColdForgedBlade.cs +++ b/Scripts/Items/Weapons/ML Weapons/Artifacts/ColdForgedBlade.cs @@ -6,7 +6,7 @@ namespace Server.Items { public class ColdForgedBlade : ElvenSpellblade { - public override int LabelNumber{ get{ return 1072916; } } // Cold Forged Blade + public override int LabelNumber => 1072916; // Cold Forged Blade [Constructible] public ColdForgedBlade() @@ -44,4 +44,4 @@ namespace Server.Items int version = reader.ReadEncodedInt(); } } -} \ No newline at end of file +} diff --git a/Scripts/Items/Weapons/ML Weapons/Artifacts/LuminousRuneBlade.cs b/Scripts/Items/Weapons/ML Weapons/Artifacts/LuminousRuneBlade.cs index 457a9b69a..587f24aed 100644 --- a/Scripts/Items/Weapons/ML Weapons/Artifacts/LuminousRuneBlade.cs +++ b/Scripts/Items/Weapons/ML Weapons/Artifacts/LuminousRuneBlade.cs @@ -6,7 +6,7 @@ namespace Server.Items { public class LuminousRuneBlade : RuneBlade { - public override int LabelNumber{ get{ return 1072922; } } // Luminous Rune Blade + public override int LabelNumber => 1072922; // Luminous Rune Blade [Constructible] public LuminousRuneBlade() @@ -44,4 +44,4 @@ namespace Server.Items int version = reader.ReadEncodedInt(); } } -} \ No newline at end of file +} diff --git a/Scripts/Items/Weapons/ML Weapons/Artifacts/OverseerSunderedBlade.cs b/Scripts/Items/Weapons/ML Weapons/Artifacts/OverseerSunderedBlade.cs index d074dad24..8931c3af6 100644 --- a/Scripts/Items/Weapons/ML Weapons/Artifacts/OverseerSunderedBlade.cs +++ b/Scripts/Items/Weapons/ML Weapons/Artifacts/OverseerSunderedBlade.cs @@ -6,7 +6,7 @@ namespace Server.Items { public class OverseerSunderedBlade : RadiantScimitar { - public override int LabelNumber{ get{ return 1072920; } } // Overseer Sundered Blade + public override int LabelNumber => 1072920; // Overseer Sundered Blade [Constructible] public OverseerSunderedBlade() @@ -46,4 +46,4 @@ namespace Server.Items int version = reader.ReadEncodedInt(); } } -} \ No newline at end of file +} diff --git a/Scripts/Items/Weapons/ML Weapons/Artifacts/PhantomStaff.cs b/Scripts/Items/Weapons/ML Weapons/Artifacts/PhantomStaff.cs index 9e9ba0ad3..e10a66936 100644 --- a/Scripts/Items/Weapons/ML Weapons/Artifacts/PhantomStaff.cs +++ b/Scripts/Items/Weapons/ML Weapons/Artifacts/PhantomStaff.cs @@ -6,7 +6,7 @@ namespace Server.Items { public class PhantomStaff : WildStaff { - public override int LabelNumber{ get{ return 1072919; } } // Phantom Staff + public override int LabelNumber => 1072919; // Phantom Staff [Constructible] public PhantomStaff() @@ -42,4 +42,4 @@ namespace Server.Items int version = reader.ReadEncodedInt(); } } -} \ No newline at end of file +} diff --git a/Scripts/Items/Weapons/ML Weapons/Artifacts/RuneCarvingKnife.cs b/Scripts/Items/Weapons/ML Weapons/Artifacts/RuneCarvingKnife.cs index 3a9a804bd..9ef92fc49 100644 --- a/Scripts/Items/Weapons/ML Weapons/Artifacts/RuneCarvingKnife.cs +++ b/Scripts/Items/Weapons/ML Weapons/Artifacts/RuneCarvingKnife.cs @@ -6,7 +6,7 @@ namespace Server.Items { public class RuneCarvingKnife : AssassinSpike { - public override int LabelNumber{ get{ return 1072915; } } // Rune Carving Knife + public override int LabelNumber => 1072915; // Rune Carving Knife [Constructible] public RuneCarvingKnife() @@ -38,4 +38,4 @@ namespace Server.Items int version = reader.ReadEncodedInt(); } } -} \ No newline at end of file +} diff --git a/Scripts/Items/Weapons/ML Weapons/Artifacts/ShardTrasher.cs b/Scripts/Items/Weapons/ML Weapons/Artifacts/ShardTrasher.cs index 1de52e35f..21ef209e1 100644 --- a/Scripts/Items/Weapons/ML Weapons/Artifacts/ShardTrasher.cs +++ b/Scripts/Items/Weapons/ML Weapons/Artifacts/ShardTrasher.cs @@ -6,7 +6,7 @@ namespace Server.Items { public class ShardThrasher : DiamondMace { - public override int LabelNumber{ get{ return 1072918; } } // Shard Thrasher + public override int LabelNumber => 1072918; // Shard Thrasher [Constructible] public ShardThrasher() @@ -38,4 +38,4 @@ namespace Server.Items int version = reader.ReadEncodedInt(); } } -} \ No newline at end of file +} diff --git a/Scripts/Items/Weapons/ML Weapons/Artifacts/SilvanisFeywoodBow.cs b/Scripts/Items/Weapons/ML Weapons/Artifacts/SilvanisFeywoodBow.cs index 11ec472d3..e1f18bb41 100644 --- a/Scripts/Items/Weapons/ML Weapons/Artifacts/SilvanisFeywoodBow.cs +++ b/Scripts/Items/Weapons/ML Weapons/Artifacts/SilvanisFeywoodBow.cs @@ -6,7 +6,7 @@ namespace Server.Items { public class SilvanisFeywoodBow : ElvenCompositeLongbow { - public override int LabelNumber{ get{ return 1072955; } } // Silvani's Feywood Bow + public override int LabelNumber => 1072955; // Silvani's Feywood Bow [Constructible] public SilvanisFeywoodBow() @@ -43,4 +43,4 @@ namespace Server.Items int version = reader.ReadEncodedInt(); } } -} \ No newline at end of file +} diff --git a/Scripts/Items/Weapons/ML Weapons/Artifacts/TheNightReaper.cs b/Scripts/Items/Weapons/ML Weapons/Artifacts/TheNightReaper.cs index cd1156e5c..33e93f4cb 100644 --- a/Scripts/Items/Weapons/ML Weapons/Artifacts/TheNightReaper.cs +++ b/Scripts/Items/Weapons/ML Weapons/Artifacts/TheNightReaper.cs @@ -6,7 +6,7 @@ namespace Server.Items { public class TheNightReaper : RepeatingCrossbow { - public override int LabelNumber{ get{ return 1072912; } } // The Night Reaper + public override int LabelNumber => 1072912; // The Night Reaper [Constructible] public TheNightReaper() @@ -38,4 +38,4 @@ namespace Server.Items int version = reader.ReadInt(); } } -} \ No newline at end of file +} diff --git a/Scripts/Items/Weapons/ML Weapons/AssassinSpike.cs b/Scripts/Items/Weapons/ML Weapons/AssassinSpike.cs index 31f2eba2c..229c77e5d 100644 --- a/Scripts/Items/Weapons/ML Weapons/AssassinSpike.cs +++ b/Scripts/Items/Weapons/ML Weapons/AssassinSpike.cs @@ -7,25 +7,25 @@ namespace Server.Items [FlippableAttribute( 0x2D21, 0x2D2D )] public class AssassinSpike : BaseKnife { - public override WeaponAbility PrimaryAbility{ get{ return WeaponAbility.InfectiousStrike; } } - public override WeaponAbility SecondaryAbility{ get{ return WeaponAbility.ShadowStrike; } } + public override WeaponAbility PrimaryAbility => WeaponAbility.InfectiousStrike; + public override WeaponAbility SecondaryAbility => WeaponAbility.ShadowStrike; - public override int AosStrengthReq{ get{ return 15; } } - public override int AosMinDamage{ get{ return 10; } } - public override int AosMaxDamage{ get{ return 12; } } - public override int AosSpeed{ get{ return 50; } } - public override float MlSpeed{ get{ return 2.00f; } } + public override int AosStrengthReq => 15; + public override int AosMinDamage => 10; + public override int AosMaxDamage => 12; + public override int AosSpeed => 50; + public override float MlSpeed => 2.00f; - public override int OldStrengthReq{ get{ return 15; } } - public override int OldMinDamage{ get{ return 10; } } - public override int OldMaxDamage{ get{ return 12; } } - public override int OldSpeed{ get{ return 50; } } + public override int OldStrengthReq => 15; + public override int OldMinDamage => 10; + public override int OldMaxDamage => 12; + public override int OldSpeed => 50; - public override int DefMissSound{ get{ return 0x239; } } - public override SkillName DefSkill { get { return SkillName.Fencing; } } + public override int DefMissSound => 0x239; + public override SkillName DefSkill => SkillName.Fencing; - public override int InitMinHits{ get{ return 30; } } // TODO - public override int InitMaxHits{ get{ return 60; } } // TODO + public override int InitMinHits => 30; // TODO + public override int InitMaxHits => 60; // TODO [Constructible] public AssassinSpike() : base( 0x2D21 ) @@ -51,4 +51,4 @@ namespace Server.Items int version = reader.ReadEncodedInt(); } } -} \ No newline at end of file +} diff --git a/Scripts/Items/Weapons/ML Weapons/ButchersWarCleaver.cs b/Scripts/Items/Weapons/ML Weapons/ButchersWarCleaver.cs index ae969023d..bd7645ef0 100644 --- a/Scripts/Items/Weapons/ML Weapons/ButchersWarCleaver.cs +++ b/Scripts/Items/Weapons/ML Weapons/ButchersWarCleaver.cs @@ -5,21 +5,21 @@ namespace Server.Items { public class ButchersWarCleaver : WarCleaver { - public override int LabelNumber{ get{ return 1073526; } } // butcher's war cleaver + public override int LabelNumber => 1073526; // butcher's war cleaver [Constructible] - public ButchersWarCleaver() : base() + public ButchersWarCleaver() { } public ButchersWarCleaver( Serial serial ) : base( serial ) { } - + public override void AppendChildNameProperties( ObjectPropertyList list ) { base.AppendChildNameProperties( list ); - + list.Add( 1072512 ); // Bovine Slayer } @@ -37,4 +37,4 @@ namespace Server.Items int version = reader.ReadEncodedInt(); } } -} \ No newline at end of file +} diff --git a/Scripts/Items/Weapons/ML Weapons/DiamondMace.cs b/Scripts/Items/Weapons/ML Weapons/DiamondMace.cs index e4ed7f780..98cfccf56 100644 --- a/Scripts/Items/Weapons/ML Weapons/DiamondMace.cs +++ b/Scripts/Items/Weapons/ML Weapons/DiamondMace.cs @@ -7,22 +7,22 @@ namespace Server.Items [FlippableAttribute( 0x2D24, 0x2D30 )] public class DiamondMace : BaseBashing { - public override WeaponAbility PrimaryAbility{ get{ return WeaponAbility.ConcussionBlow; } } - public override WeaponAbility SecondaryAbility{ get{ return WeaponAbility.CrushingBlow; } } + public override WeaponAbility PrimaryAbility => WeaponAbility.ConcussionBlow; + public override WeaponAbility SecondaryAbility => WeaponAbility.CrushingBlow; - public override int AosStrengthReq{ get{ return 35; } } - public override int AosMinDamage{ get{ return 14; } } - public override int AosMaxDamage{ get{ return 17; } } - public override int AosSpeed{ get{ return 37; } } - public override float MlSpeed{ get{ return 3.00f; } } + public override int AosStrengthReq => 35; + public override int AosMinDamage => 14; + public override int AosMaxDamage => 17; + public override int AosSpeed => 37; + public override float MlSpeed => 3.00f; - public override int OldStrengthReq{ get{ return 35; } } - public override int OldMinDamage{ get{ return 14; } } - public override int OldMaxDamage{ get{ return 17; } } - public override int OldSpeed{ get{ return 37; } } + public override int OldStrengthReq => 35; + public override int OldMinDamage => 14; + public override int OldMaxDamage => 17; + public override int OldSpeed => 37; - public override int InitMinHits{ get{ return 30; } } // TODO - public override int InitMaxHits{ get{ return 60; } } // TODO + public override int InitMinHits => 30; // TODO + public override int InitMaxHits => 60; // TODO [Constructible] public DiamondMace() : base( 0x2D24 ) @@ -48,4 +48,4 @@ namespace Server.Items int version = reader.ReadEncodedInt(); } } -} \ No newline at end of file +} diff --git a/Scripts/Items/Weapons/ML Weapons/ElvenCompositeLongbow.cs b/Scripts/Items/Weapons/ML Weapons/ElvenCompositeLongbow.cs index 594a21006..df2f72c7e 100644 --- a/Scripts/Items/Weapons/ML Weapons/ElvenCompositeLongbow.cs +++ b/Scripts/Items/Weapons/ML Weapons/ElvenCompositeLongbow.cs @@ -7,30 +7,30 @@ namespace Server.Items [FlippableAttribute( 0x2D1E, 0x2D2A )] public class ElvenCompositeLongbow : BaseRanged { - public override int EffectID{ get{ return 0xF42; } } - public override Type AmmoType{ get{ return typeof( Arrow ); } } - public override Item Ammo{ get{ return new Arrow(); } } + public override int EffectID => 0xF42; + public override Type AmmoType => typeof( Arrow ); + public override Item Ammo => new Arrow(); - public override WeaponAbility PrimaryAbility{ get{ return WeaponAbility.ForceArrow; } } - public override WeaponAbility SecondaryAbility{ get{ return WeaponAbility.SerpentArrow; } } + public override WeaponAbility PrimaryAbility => WeaponAbility.ForceArrow; + public override WeaponAbility SecondaryAbility => WeaponAbility.SerpentArrow; - public override int AosStrengthReq{ get{ return 45; } } - public override int AosMinDamage{ get{ return 12; } } - public override int AosMaxDamage{ get{ return 16; } } - public override int AosSpeed{ get{ return 27; } } - public override float MlSpeed{ get{ return 4.00f; } } + public override int AosStrengthReq => 45; + public override int AosMinDamage => 12; + public override int AosMaxDamage => 16; + public override int AosSpeed => 27; + public override float MlSpeed => 4.00f; - public override int OldStrengthReq{ get{ return 45; } } - public override int OldMinDamage{ get{ return 12; } } - public override int OldMaxDamage{ get{ return 16; } } - public override int OldSpeed{ get{ return 27; } } + public override int OldStrengthReq => 45; + public override int OldMinDamage => 12; + public override int OldMaxDamage => 16; + public override int OldSpeed => 27; - public override int DefMaxRange{ get{ return 10; } } + public override int DefMaxRange => 10; - public override int InitMinHits{ get{ return 41; } } - public override int InitMaxHits{ get{ return 90; } } + public override int InitMinHits => 41; + public override int InitMaxHits => 90; - public override WeaponAnimation DefAnimation{ get{ return WeaponAnimation.ShootBow; } } + public override WeaponAnimation DefAnimation => WeaponAnimation.ShootBow; [Constructible] public ElvenCompositeLongbow() : base( 0x2D1E ) @@ -56,4 +56,4 @@ namespace Server.Items int version = reader.ReadEncodedInt(); } } -} \ No newline at end of file +} diff --git a/Scripts/Items/Weapons/ML Weapons/ElvenMachete.cs b/Scripts/Items/Weapons/ML Weapons/ElvenMachete.cs index 26f7f0087..d1d3a404f 100644 --- a/Scripts/Items/Weapons/ML Weapons/ElvenMachete.cs +++ b/Scripts/Items/Weapons/ML Weapons/ElvenMachete.cs @@ -7,25 +7,25 @@ namespace Server.Items [FlippableAttribute( 0x2D35, 0x2D29 )] public class ElvenMachete : BaseSword { - public override WeaponAbility PrimaryAbility{ get{ return WeaponAbility.DefenseMastery; } } - public override WeaponAbility SecondaryAbility{ get{ return WeaponAbility.Bladeweave; } } + public override WeaponAbility PrimaryAbility => WeaponAbility.DefenseMastery; + public override WeaponAbility SecondaryAbility => WeaponAbility.Bladeweave; - public override int AosStrengthReq{ get{ return 20; } } - public override int AosMinDamage{ get{ return 13; } } - public override int AosMaxDamage{ get{ return 15; } } - public override int AosSpeed{ get{ return 41; } } - public override float MlSpeed{ get{ return 2.75f; } } + public override int AosStrengthReq => 20; + public override int AosMinDamage => 13; + public override int AosMaxDamage => 15; + public override int AosSpeed => 41; + public override float MlSpeed => 2.75f; - public override int OldStrengthReq{ get{ return 20; } } - public override int OldMinDamage{ get{ return 13; } } - public override int OldMaxDamage{ get{ return 15; } } - public override int OldSpeed{ get{ return 41; } } + public override int OldStrengthReq => 20; + public override int OldMinDamage => 13; + public override int OldMaxDamage => 15; + public override int OldSpeed => 41; - public override int DefHitSound{ get{ return 0x23B; } } - public override int DefMissSound{ get{ return 0x239; } } + public override int DefHitSound => 0x23B; + public override int DefMissSound => 0x239; - public override int InitMinHits{ get{ return 30; } } - public override int InitMaxHits{ get{ return 60; } } + public override int InitMinHits => 30; + public override int InitMaxHits => 60; [Constructible] public ElvenMachete() : base( 0x2D35 ) @@ -51,4 +51,4 @@ namespace Server.Items int version = reader.ReadEncodedInt(); } } -} \ No newline at end of file +} diff --git a/Scripts/Items/Weapons/ML Weapons/ElvenSpellblade.cs b/Scripts/Items/Weapons/ML Weapons/ElvenSpellblade.cs index 9c9db9f1a..c6b7c4aae 100644 --- a/Scripts/Items/Weapons/ML Weapons/ElvenSpellblade.cs +++ b/Scripts/Items/Weapons/ML Weapons/ElvenSpellblade.cs @@ -7,24 +7,24 @@ namespace Server.Items [FlippableAttribute( 0x2D20, 0x2D2C )] public class ElvenSpellblade : BaseKnife { - public override WeaponAbility PrimaryAbility{ get{ return WeaponAbility.PsychicAttack; } } - public override WeaponAbility SecondaryAbility{ get{ return WeaponAbility.BleedAttack; } } + public override WeaponAbility PrimaryAbility => WeaponAbility.PsychicAttack; + public override WeaponAbility SecondaryAbility => WeaponAbility.BleedAttack; - public override int AosStrengthReq{ get{ return 35; } } - public override int AosMinDamage{ get{ return 12; } } - public override int AosMaxDamage{ get{ return 14; } } - public override int AosSpeed{ get{ return 44; } } - public override float MlSpeed{ get{ return 2.50f; } } + public override int AosStrengthReq => 35; + public override int AosMinDamage => 12; + public override int AosMaxDamage => 14; + public override int AosSpeed => 44; + public override float MlSpeed => 2.50f; - public override int OldStrengthReq{ get{ return 35; } } - public override int OldMinDamage{ get{ return 12; } } - public override int OldMaxDamage{ get{ return 14; } } - public override int OldSpeed{ get{ return 44; } } + public override int OldStrengthReq => 35; + public override int OldMinDamage => 12; + public override int OldMaxDamage => 14; + public override int OldSpeed => 44; - public override int DefMissSound{ get{ return 0x239; } } + public override int DefMissSound => 0x239; - public override int InitMinHits{ get{ return 30; } } // TODO - public override int InitMaxHits{ get{ return 60; } } // TODO + public override int InitMinHits => 30; // TODO + public override int InitMaxHits => 60; // TODO [Constructible] public ElvenSpellblade() : base( 0x2D20 ) @@ -51,4 +51,4 @@ namespace Server.Items int version = reader.ReadEncodedInt(); } } -} \ No newline at end of file +} diff --git a/Scripts/Items/Weapons/ML Weapons/Leafblade.cs b/Scripts/Items/Weapons/ML Weapons/Leafblade.cs index 3b31a378e..30f070a01 100644 --- a/Scripts/Items/Weapons/ML Weapons/Leafblade.cs +++ b/Scripts/Items/Weapons/ML Weapons/Leafblade.cs @@ -7,25 +7,25 @@ namespace Server.Items [FlippableAttribute( 0x2D22, 0x2D2E )] public class Leafblade : BaseKnife { - public override WeaponAbility PrimaryAbility{ get{ return WeaponAbility.Feint; } } - public override WeaponAbility SecondaryAbility{ get{ return WeaponAbility.ArmorIgnore; } } + public override WeaponAbility PrimaryAbility => WeaponAbility.Feint; + public override WeaponAbility SecondaryAbility => WeaponAbility.ArmorIgnore; - public override int AosStrengthReq{ get{ return 20; } } - public override int AosMinDamage{ get{ return 13; } } - public override int AosMaxDamage{ get{ return 15; } } - public override int AosSpeed{ get{ return 42; } } - public override float MlSpeed{ get{ return 2.75f; } } + public override int AosStrengthReq => 20; + public override int AosMinDamage => 13; + public override int AosMaxDamage => 15; + public override int AosSpeed => 42; + public override float MlSpeed => 2.75f; - public override int OldStrengthReq{ get{ return 20; } } - public override int OldMinDamage{ get{ return 13; } } - public override int OldMaxDamage{ get{ return 15; } } - public override int OldSpeed{ get{ return 42; } } + public override int OldStrengthReq => 20; + public override int OldMinDamage => 13; + public override int OldMaxDamage => 15; + public override int OldSpeed => 42; - public override int DefMissSound{ get{ return 0x239; } } - public override SkillName DefSkill { get { return SkillName.Fencing; } } + public override int DefMissSound => 0x239; + public override SkillName DefSkill => SkillName.Fencing; - public override int InitMinHits{ get{ return 30; } } // TODO - public override int InitMaxHits{ get{ return 60; } } // TODO + public override int InitMinHits => 30; // TODO + public override int InitMaxHits => 60; // TODO [Constructible] public Leafblade() : base( 0x2D22 ) @@ -51,4 +51,4 @@ namespace Server.Items int version = reader.ReadEncodedInt(); } } -} \ No newline at end of file +} diff --git a/Scripts/Items/Weapons/ML Weapons/MagicalShortbow.cs b/Scripts/Items/Weapons/ML Weapons/MagicalShortbow.cs index a4e599d8a..c2cf108d8 100644 --- a/Scripts/Items/Weapons/ML Weapons/MagicalShortbow.cs +++ b/Scripts/Items/Weapons/ML Weapons/MagicalShortbow.cs @@ -7,28 +7,28 @@ namespace Server.Items [FlippableAttribute( 0x2D2B, 0x2D1F )] public class MagicalShortbow : BaseRanged { - public override int EffectID{ get{ return 0xF42; } } - public override Type AmmoType{ get{ return typeof( Arrow ); } } - public override Item Ammo{ get{ return new Arrow(); } } + public override int EffectID => 0xF42; + public override Type AmmoType => typeof( Arrow ); + public override Item Ammo => new Arrow(); - public override WeaponAbility PrimaryAbility{ get{ return WeaponAbility.LightningArrow; } } - public override WeaponAbility SecondaryAbility{ get{ return WeaponAbility.PsychicAttack; } } + public override WeaponAbility PrimaryAbility => WeaponAbility.LightningArrow; + public override WeaponAbility SecondaryAbility => WeaponAbility.PsychicAttack; - public override int AosStrengthReq{ get{ return 45; } } - public override int AosMinDamage{ get{ return 9; } } - public override int AosMaxDamage{ get{ return 13; } } - public override int AosSpeed{ get{ return 38; } } - public override float MlSpeed{ get{ return 3.00f; } } + public override int AosStrengthReq => 45; + public override int AosMinDamage => 9; + public override int AosMaxDamage => 13; + public override int AosSpeed => 38; + public override float MlSpeed => 3.00f; - public override int OldStrengthReq{ get{ return 45; } } - public override int OldMinDamage{ get{ return 9; } } - public override int OldMaxDamage{ get{ return 13; } } - public override int OldSpeed{ get{ return 38; } } + public override int OldStrengthReq => 45; + public override int OldMinDamage => 9; + public override int OldMaxDamage => 13; + public override int OldSpeed => 38; - public override int DefMaxRange{ get{ return 10; } } + public override int DefMaxRange => 10; - public override int InitMinHits{ get{ return 41; } } - public override int InitMaxHits{ get{ return 90; } } + public override int InitMinHits => 41; + public override int InitMaxHits => 90; [Constructible] public MagicalShortbow() : base( 0x2D2B ) @@ -54,4 +54,4 @@ namespace Server.Items int version = reader.ReadEncodedInt(); } } -} \ No newline at end of file +} diff --git a/Scripts/Items/Weapons/ML Weapons/OrnateAxe.cs b/Scripts/Items/Weapons/ML Weapons/OrnateAxe.cs index c61f3efca..ff14b6eaa 100644 --- a/Scripts/Items/Weapons/ML Weapons/OrnateAxe.cs +++ b/Scripts/Items/Weapons/ML Weapons/OrnateAxe.cs @@ -7,24 +7,24 @@ namespace Server.Items [FlippableAttribute( 0x2D28, 0x2D34 )] public class OrnateAxe : BaseAxe { - public override WeaponAbility PrimaryAbility{ get{ return WeaponAbility.Disarm; } } - public override WeaponAbility SecondaryAbility{ get{ return WeaponAbility.CrushingBlow; } } + public override WeaponAbility PrimaryAbility => WeaponAbility.Disarm; + public override WeaponAbility SecondaryAbility => WeaponAbility.CrushingBlow; - public override int AosStrengthReq{ get{ return 45; } } - public override int AosMinDamage{ get{ return 18; } } - public override int AosMaxDamage{ get{ return 20; } } - public override int AosSpeed{ get{ return 26; } } - public override float MlSpeed{ get{ return 3.50f; } } + public override int AosStrengthReq => 45; + public override int AosMinDamage => 18; + public override int AosMaxDamage => 20; + public override int AosSpeed => 26; + public override float MlSpeed => 3.50f; - public override int OldStrengthReq{ get{ return 45; } } - public override int OldMinDamage{ get{ return 18; } } - public override int OldMaxDamage{ get{ return 20; } } - public override int OldSpeed{ get{ return 26; } } + public override int OldStrengthReq => 45; + public override int OldMinDamage => 18; + public override int OldMaxDamage => 20; + public override int OldSpeed => 26; - public override int DefMissSound{ get{ return 0x239; } } + public override int DefMissSound => 0x239; - public override int InitMinHits{ get{ return 30; } } - public override int InitMaxHits{ get{ return 60; } } + public override int InitMinHits => 30; + public override int InitMaxHits => 60; [Constructible] public OrnateAxe() : base( 0x2D28 ) @@ -51,4 +51,4 @@ namespace Server.Items int version = reader.ReadEncodedInt(); } } -} \ No newline at end of file +} diff --git a/Scripts/Items/Weapons/ML Weapons/RadiantScimitar.cs b/Scripts/Items/Weapons/ML Weapons/RadiantScimitar.cs index 37781e126..f16cd581b 100644 --- a/Scripts/Items/Weapons/ML Weapons/RadiantScimitar.cs +++ b/Scripts/Items/Weapons/ML Weapons/RadiantScimitar.cs @@ -7,25 +7,25 @@ namespace Server.Items [FlippableAttribute( 0x2D33, 0x2D27 )] public class RadiantScimitar : BaseSword { - public override WeaponAbility PrimaryAbility{ get{ return WeaponAbility.WhirlwindAttack; } } - public override WeaponAbility SecondaryAbility{ get{ return WeaponAbility.Bladeweave; } } + public override WeaponAbility PrimaryAbility => WeaponAbility.WhirlwindAttack; + public override WeaponAbility SecondaryAbility => WeaponAbility.Bladeweave; - public override int AosStrengthReq{ get{ return 20; } } - public override int AosMinDamage{ get{ return 12; } } - public override int AosMaxDamage{ get{ return 14; } } - public override int AosSpeed{ get{ return 43; } } - public override float MlSpeed{ get{ return 2.50f; } } + public override int AosStrengthReq => 20; + public override int AosMinDamage => 12; + public override int AosMaxDamage => 14; + public override int AosSpeed => 43; + public override float MlSpeed => 2.50f; - public override int OldStrengthReq{ get{ return 20; } } - public override int OldMinDamage{ get{ return 12; } } - public override int OldMaxDamage{ get{ return 14; } } - public override int OldSpeed{ get{ return 43; } } + public override int OldStrengthReq => 20; + public override int OldMinDamage => 12; + public override int OldMaxDamage => 14; + public override int OldSpeed => 43; - public override int DefHitSound{ get{ return 0x23B; } } - public override int DefMissSound{ get{ return 0x239; } } + public override int DefHitSound => 0x23B; + public override int DefMissSound => 0x239; - public override int InitMinHits{ get{ return 30; } } - public override int InitMaxHits{ get{ return 60; } } + public override int InitMinHits => 30; + public override int InitMaxHits => 60; [Constructible] public RadiantScimitar() : base( 0x2D33 ) @@ -51,4 +51,4 @@ namespace Server.Items int version = reader.ReadEncodedInt(); } } -} \ No newline at end of file +} diff --git a/Scripts/Items/Weapons/ML Weapons/RuneBlade.cs b/Scripts/Items/Weapons/ML Weapons/RuneBlade.cs index 065420f12..7b7aab193 100644 --- a/Scripts/Items/Weapons/ML Weapons/RuneBlade.cs +++ b/Scripts/Items/Weapons/ML Weapons/RuneBlade.cs @@ -7,25 +7,25 @@ namespace Server.Items [FlippableAttribute( 0x2D32, 0x2D26 )] public class RuneBlade : BaseSword { - public override WeaponAbility PrimaryAbility{ get{ return WeaponAbility.Disarm; } } - public override WeaponAbility SecondaryAbility{ get{ return WeaponAbility.Bladeweave; } } + public override WeaponAbility PrimaryAbility => WeaponAbility.Disarm; + public override WeaponAbility SecondaryAbility => WeaponAbility.Bladeweave; - public override int AosStrengthReq{ get{ return 30; } } - public override int AosMinDamage{ get{ return 15; } } - public override int AosMaxDamage{ get{ return 17; } } - public override int AosSpeed{ get{ return 35; } } - public override float MlSpeed{ get{ return 3.00f; } } + public override int AosStrengthReq => 30; + public override int AosMinDamage => 15; + public override int AosMaxDamage => 17; + public override int AosSpeed => 35; + public override float MlSpeed => 3.00f; - public override int OldStrengthReq{ get{ return 30; } } - public override int OldMinDamage{ get{ return 15; } } - public override int OldMaxDamage{ get{ return 17; } } - public override int OldSpeed{ get{ return 35; } } + public override int OldStrengthReq => 30; + public override int OldMinDamage => 15; + public override int OldMaxDamage => 17; + public override int OldSpeed => 35; - public override int DefHitSound{ get{ return 0x23B; } } - public override int DefMissSound{ get{ return 0x239; } } + public override int DefHitSound => 0x23B; + public override int DefMissSound => 0x239; - public override int InitMinHits{ get{ return 30; } } - public override int InitMaxHits{ get{ return 60; } } + public override int InitMinHits => 30; + public override int InitMaxHits => 60; [Constructible] public RuneBlade() : base( 0x2D32 ) @@ -52,4 +52,4 @@ namespace Server.Items int version = reader.ReadEncodedInt(); } } -} \ No newline at end of file +} diff --git a/Scripts/Items/Weapons/ML Weapons/WarCleaver.cs b/Scripts/Items/Weapons/ML Weapons/WarCleaver.cs index ec5e1d91b..47c82c963 100644 --- a/Scripts/Items/Weapons/ML Weapons/WarCleaver.cs +++ b/Scripts/Items/Weapons/ML Weapons/WarCleaver.cs @@ -7,29 +7,29 @@ namespace Server.Items [FlippableAttribute( 0x2D2F, 0x2D23 )] public class WarCleaver : BaseKnife { - public override WeaponAbility PrimaryAbility{ get{ return WeaponAbility.Disarm; } } - public override WeaponAbility SecondaryAbility{ get{ return WeaponAbility.Bladeweave; } } + public override WeaponAbility PrimaryAbility => WeaponAbility.Disarm; + public override WeaponAbility SecondaryAbility => WeaponAbility.Bladeweave; - public override int AosStrengthReq{ get{ return 15; } } - public override int AosMinDamage{ get{ return 9; } } - public override int AosMaxDamage{ get{ return 11; } } - public override int AosSpeed{ get{ return 48; } } - public override float MlSpeed{ get{ return 2.25f; } } + public override int AosStrengthReq => 15; + public override int AosMinDamage => 9; + public override int AosMaxDamage => 11; + public override int AosSpeed => 48; + public override float MlSpeed => 2.25f; - public override int OldStrengthReq{ get{ return 15; } } - public override int OldMinDamage{ get{ return 9; } } - public override int OldMaxDamage{ get{ return 11; } } - public override int OldSpeed{ get{ return 48; } } + public override int OldStrengthReq => 15; + public override int OldMinDamage => 9; + public override int OldMaxDamage => 11; + public override int OldSpeed => 48; - public override int DefHitSound{ get{ return 0x23B; } } - public override int DefMissSound{ get{ return 0x239; } } + public override int DefHitSound => 0x23B; + public override int DefMissSound => 0x239; - public override int InitMinHits{ get{ return 30; } } // TODO - public override int InitMaxHits{ get{ return 60; } } // TODO + public override int InitMinHits => 30; // TODO + public override int InitMaxHits => 60; // TODO - public override SkillName DefSkill{ get{ return SkillName.Fencing; } } - public override WeaponType DefType{ get{ return WeaponType.Piercing; } } - public override WeaponAnimation DefAnimation{ get{ return WeaponAnimation.Pierce1H; } } + public override SkillName DefSkill => SkillName.Fencing; + public override WeaponType DefType => WeaponType.Piercing; + public override WeaponAnimation DefAnimation => WeaponAnimation.Pierce1H; [Constructible] public WarCleaver() : base( 0x2D2F ) @@ -55,4 +55,4 @@ namespace Server.Items int version = reader.ReadEncodedInt(); } } -} \ No newline at end of file +} diff --git a/Scripts/Items/Weapons/ML Weapons/WildStaff.cs b/Scripts/Items/Weapons/ML Weapons/WildStaff.cs index 4bde0009c..e1b8859ef 100644 --- a/Scripts/Items/Weapons/ML Weapons/WildStaff.cs +++ b/Scripts/Items/Weapons/ML Weapons/WildStaff.cs @@ -7,22 +7,22 @@ namespace Server.Items [FlippableAttribute( 0x2D25, 0x2D31 )] public class WildStaff : BaseStaff { - public override WeaponAbility PrimaryAbility{ get{ return WeaponAbility.Block; } } - public override WeaponAbility SecondaryAbility{ get{ return WeaponAbility.ForceOfNature; } } + public override WeaponAbility PrimaryAbility => WeaponAbility.Block; + public override WeaponAbility SecondaryAbility => WeaponAbility.ForceOfNature; - public override int AosStrengthReq{ get{ return 15; } } - public override int AosMinDamage{ get{ return 10; } } - public override int AosMaxDamage{ get{ return 12; } } - public override int AosSpeed{ get{ return 48; } } - public override float MlSpeed{ get{ return 2.25f; } } + public override int AosStrengthReq => 15; + public override int AosMinDamage => 10; + public override int AosMaxDamage => 12; + public override int AosSpeed => 48; + public override float MlSpeed => 2.25f; - public override int OldStrengthReq{ get{ return 15; } } - public override int OldMinDamage{ get{ return 10; } } - public override int OldMaxDamage{ get{ return 12; } } - public override int OldSpeed{ get{ return 48; } } + public override int OldStrengthReq => 15; + public override int OldMinDamage => 10; + public override int OldMaxDamage => 12; + public override int OldSpeed => 48; - public override int InitMinHits{ get{ return 30; } } - public override int InitMaxHits{ get{ return 60; } } + public override int InitMinHits => 30; + public override int InitMaxHits => 60; [Constructible] public WildStaff() : base( 0x2D25 ) @@ -48,4 +48,4 @@ namespace Server.Items int version = reader.ReadEncodedInt(); } } -} \ No newline at end of file +} diff --git a/Scripts/Items/Weapons/Maces/BaseBashing.cs b/Scripts/Items/Weapons/Maces/BaseBashing.cs index 00b0d6b8a..f4b76cc01 100644 --- a/Scripts/Items/Weapons/Maces/BaseBashing.cs +++ b/Scripts/Items/Weapons/Maces/BaseBashing.cs @@ -6,12 +6,12 @@ namespace Server.Items { public abstract class BaseBashing : BaseMeleeWeapon { - public override int DefHitSound{ get{ return 0x233; } } - public override int DefMissSound{ get{ return 0x239; } } + public override int DefHitSound => 0x233; + public override int DefMissSound => 0x239; - public override SkillName DefSkill{ get{ return SkillName.Macing; } } - public override WeaponType DefType{ get{ return WeaponType.Bashing; } } - public override WeaponAnimation DefAnimation{ get{ return WeaponAnimation.Bash1H; } } + public override SkillName DefSkill => SkillName.Macing; + public override WeaponType DefType => WeaponType.Bashing; + public override WeaponAnimation DefAnimation => WeaponAnimation.Bash1H; public BaseBashing( int itemID ) : base( itemID ) { @@ -57,4 +57,4 @@ namespace Server.Items return damage; } } -} \ No newline at end of file +} diff --git a/Scripts/Items/Weapons/Maces/Club.cs b/Scripts/Items/Weapons/Maces/Club.cs index 3c27fa619..c8d695cbc 100644 --- a/Scripts/Items/Weapons/Maces/Club.cs +++ b/Scripts/Items/Weapons/Maces/Club.cs @@ -7,22 +7,22 @@ namespace Server.Items [FlippableAttribute( 0x13b4, 0x13b3 )] public class Club : BaseBashing { - public override WeaponAbility PrimaryAbility{ get{ return WeaponAbility.ShadowStrike; } } - public override WeaponAbility SecondaryAbility{ get{ return WeaponAbility.Dismount; } } + public override WeaponAbility PrimaryAbility => WeaponAbility.ShadowStrike; + public override WeaponAbility SecondaryAbility => WeaponAbility.Dismount; - public override int AosStrengthReq{ get{ return 40; } } - public override int AosMinDamage{ get{ return 11; } } - public override int AosMaxDamage{ get{ return 13; } } - public override int AosSpeed{ get{ return 44; } } - public override float MlSpeed{ get{ return 2.50f; } } + public override int AosStrengthReq => 40; + public override int AosMinDamage => 11; + public override int AosMaxDamage => 13; + public override int AosSpeed => 44; + public override float MlSpeed => 2.50f; - public override int OldStrengthReq{ get{ return 10; } } - public override int OldMinDamage{ get{ return 8; } } - public override int OldMaxDamage{ get{ return 24; } } - public override int OldSpeed{ get{ return 40; } } + public override int OldStrengthReq => 10; + public override int OldMinDamage => 8; + public override int OldMaxDamage => 24; + public override int OldSpeed => 40; - public override int InitMinHits{ get{ return 31; } } - public override int InitMaxHits{ get{ return 40; } } + public override int InitMinHits => 31; + public override int InitMaxHits => 40; [Constructible] public Club() : base( 0x13B4 ) @@ -48,4 +48,4 @@ namespace Server.Items int version = reader.ReadInt(); } } -} \ No newline at end of file +} diff --git a/Scripts/Items/Weapons/Maces/EmeraldMace.cs b/Scripts/Items/Weapons/Maces/EmeraldMace.cs index f0d797a10..fb35917d0 100644 --- a/Scripts/Items/Weapons/Maces/EmeraldMace.cs +++ b/Scripts/Items/Weapons/Maces/EmeraldMace.cs @@ -5,7 +5,7 @@ namespace Server.Items { public class EmeraldMace : DiamondMace { - public override int LabelNumber{ get{ return 1073530; } } // emerald mace + public override int LabelNumber => 1073530; // emerald mace [Constructible] public EmeraldMace() diff --git a/Scripts/Items/Weapons/Maces/FireworksWand.cs b/Scripts/Items/Weapons/Maces/FireworksWand.cs index de9d90b96..8a7bbd1b6 100644 --- a/Scripts/Items/Weapons/Maces/FireworksWand.cs +++ b/Scripts/Items/Weapons/Maces/FireworksWand.cs @@ -6,7 +6,7 @@ namespace Server.Items { public class FireworksWand : MagicWand { - public override int LabelNumber{ get{ return 1041424; } } // a fireworks wand + public override int LabelNumber => 1041424; // a fireworks wand private int m_Charges; @@ -135,4 +135,4 @@ namespace Server.Items } } } -} \ No newline at end of file +} diff --git a/Scripts/Items/Weapons/Maces/HammerPick.cs b/Scripts/Items/Weapons/Maces/HammerPick.cs index a18e6261f..d5414ce22 100644 --- a/Scripts/Items/Weapons/Maces/HammerPick.cs +++ b/Scripts/Items/Weapons/Maces/HammerPick.cs @@ -7,22 +7,22 @@ namespace Server.Items [FlippableAttribute( 0x143D, 0x143C )] public class HammerPick : BaseBashing { - public override WeaponAbility PrimaryAbility{ get{ return WeaponAbility.ArmorIgnore; } } - public override WeaponAbility SecondaryAbility{ get{ return WeaponAbility.MortalStrike; } } + public override WeaponAbility PrimaryAbility => WeaponAbility.ArmorIgnore; + public override WeaponAbility SecondaryAbility => WeaponAbility.MortalStrike; - public override int AosStrengthReq{ get{ return 45; } } - public override int AosMinDamage{ get{ return 15; } } - public override int AosMaxDamage{ get{ return 17; } } - public override int AosSpeed{ get{ return 28; } } - public override float MlSpeed{ get{ return 3.75f; } } + public override int AosStrengthReq => 45; + public override int AosMinDamage => 15; + public override int AosMaxDamage => 17; + public override int AosSpeed => 28; + public override float MlSpeed => 3.75f; - public override int OldStrengthReq{ get{ return 35; } } - public override int OldMinDamage{ get{ return 6; } } - public override int OldMaxDamage{ get{ return 33; } } - public override int OldSpeed{ get{ return 30; } } + public override int OldStrengthReq => 35; + public override int OldMinDamage => 6; + public override int OldMaxDamage => 33; + public override int OldSpeed => 30; - public override int InitMinHits{ get{ return 31; } } - public override int InitMaxHits{ get{ return 70; } } + public override int InitMinHits => 31; + public override int InitMaxHits => 70; [Constructible] public HammerPick() : base( 0x143D ) @@ -49,4 +49,4 @@ namespace Server.Items int version = reader.ReadInt(); } } -} \ No newline at end of file +} diff --git a/Scripts/Items/Weapons/Maces/Mace.cs b/Scripts/Items/Weapons/Maces/Mace.cs index 66dd1ca4e..000eb6ee0 100644 --- a/Scripts/Items/Weapons/Maces/Mace.cs +++ b/Scripts/Items/Weapons/Maces/Mace.cs @@ -7,22 +7,22 @@ namespace Server.Items [FlippableAttribute( 0xF5C, 0xF5D )] public class Mace : BaseBashing { - public override WeaponAbility PrimaryAbility{ get{ return WeaponAbility.ConcussionBlow; } } - public override WeaponAbility SecondaryAbility{ get{ return WeaponAbility.Disarm; } } + public override WeaponAbility PrimaryAbility => WeaponAbility.ConcussionBlow; + public override WeaponAbility SecondaryAbility => WeaponAbility.Disarm; - public override int AosStrengthReq{ get{ return 45; } } - public override int AosMinDamage{ get{ return 12; } } - public override int AosMaxDamage{ get{ return 14; } } - public override int AosSpeed{ get{ return 40; } } - public override float MlSpeed{ get{ return 2.75f; } } + public override int AosStrengthReq => 45; + public override int AosMinDamage => 12; + public override int AosMaxDamage => 14; + public override int AosSpeed => 40; + public override float MlSpeed => 2.75f; - public override int OldStrengthReq{ get{ return 20; } } - public override int OldMinDamage{ get{ return 8; } } - public override int OldMaxDamage{ get{ return 32; } } - public override int OldSpeed{ get{ return 30; } } + public override int OldStrengthReq => 20; + public override int OldMinDamage => 8; + public override int OldMaxDamage => 32; + public override int OldSpeed => 30; - public override int InitMinHits{ get{ return 31; } } - public override int InitMaxHits{ get{ return 70; } } + public override int InitMinHits => 31; + public override int InitMaxHits => 70; [Constructible] public Mace() : base( 0xF5C ) @@ -48,4 +48,4 @@ namespace Server.Items int version = reader.ReadInt(); } } -} \ No newline at end of file +} diff --git a/Scripts/Items/Weapons/Maces/MagicWand.cs b/Scripts/Items/Weapons/Maces/MagicWand.cs index 3306197bf..ca4258d3f 100644 --- a/Scripts/Items/Weapons/Maces/MagicWand.cs +++ b/Scripts/Items/Weapons/Maces/MagicWand.cs @@ -6,22 +6,22 @@ namespace Server.Items { public class MagicWand : BaseBashing { - public override WeaponAbility PrimaryAbility { get { return WeaponAbility.Dismount; } } - public override WeaponAbility SecondaryAbility { get { return WeaponAbility.Disarm; } } + public override WeaponAbility PrimaryAbility => WeaponAbility.Dismount; + public override WeaponAbility SecondaryAbility => WeaponAbility.Disarm; - public override int AosStrengthReq{ get{ return 5; } } - public override int AosMinDamage{ get{ return 9; } } - public override int AosMaxDamage{ get{ return 11; } } - public override int AosSpeed{ get{ return 40; } } - public override float MlSpeed{ get{ return 2.75f; } } + public override int AosStrengthReq => 5; + public override int AosMinDamage => 9; + public override int AosMaxDamage => 11; + public override int AosSpeed => 40; + public override float MlSpeed => 2.75f; - public override int OldStrengthReq{ get{ return 0; } } - public override int OldMinDamage{ get{ return 2; } } - public override int OldMaxDamage{ get{ return 6; } } - public override int OldSpeed{ get{ return 35; } } + public override int OldStrengthReq => 0; + public override int OldMinDamage => 2; + public override int OldMaxDamage => 6; + public override int OldSpeed => 35; - public override int InitMinHits{ get{ return 31; } } - public override int InitMaxHits{ get{ return 110; } } + public override int InitMinHits => 31; + public override int InitMaxHits => 110; [Constructible] public MagicWand() : base( 0xDF2 ) @@ -47,4 +47,4 @@ namespace Server.Items int version = reader.ReadInt(); } } -} \ No newline at end of file +} diff --git a/Scripts/Items/Weapons/Maces/Maul.cs b/Scripts/Items/Weapons/Maces/Maul.cs index 80793a435..dcf0f75ae 100644 --- a/Scripts/Items/Weapons/Maces/Maul.cs +++ b/Scripts/Items/Weapons/Maces/Maul.cs @@ -7,22 +7,22 @@ namespace Server.Items [FlippableAttribute( 0x143B, 0x143A )] public class Maul : BaseBashing { - public override WeaponAbility PrimaryAbility{ get{ return WeaponAbility.CrushingBlow; } } - public override WeaponAbility SecondaryAbility{ get{ return WeaponAbility.ConcussionBlow; } } + public override WeaponAbility PrimaryAbility => WeaponAbility.CrushingBlow; + public override WeaponAbility SecondaryAbility => WeaponAbility.ConcussionBlow; - public override int AosStrengthReq{ get{ return 45; } } - public override int AosMinDamage{ get{ return 14; } } - public override int AosMaxDamage{ get{ return 16; } } - public override int AosSpeed{ get{ return 32; } } - public override float MlSpeed{ get{ return 3.50f; } } + public override int AosStrengthReq => 45; + public override int AosMinDamage => 14; + public override int AosMaxDamage => 16; + public override int AosSpeed => 32; + public override float MlSpeed => 3.50f; - public override int OldStrengthReq{ get{ return 20; } } - public override int OldMinDamage{ get{ return 10; } } - public override int OldMaxDamage{ get{ return 30; } } - public override int OldSpeed{ get{ return 30; } } + public override int OldStrengthReq => 20; + public override int OldMinDamage => 10; + public override int OldMaxDamage => 30; + public override int OldSpeed => 30; - public override int InitMinHits{ get{ return 31; } } - public override int InitMaxHits{ get{ return 70; } } + public override int InitMinHits => 31; + public override int InitMaxHits => 70; [Constructible] public Maul() : base( 0x143B ) @@ -51,4 +51,4 @@ namespace Server.Items Weight = 10.0; } } -} \ No newline at end of file +} diff --git a/Scripts/Items/Weapons/Maces/RubyMace.cs b/Scripts/Items/Weapons/Maces/RubyMace.cs index 988a2fb11..402ca8dd3 100644 --- a/Scripts/Items/Weapons/Maces/RubyMace.cs +++ b/Scripts/Items/Weapons/Maces/RubyMace.cs @@ -5,7 +5,7 @@ namespace Server.Items { public class RubyMace : DiamondMace { - public override int LabelNumber{ get{ return 1073529; } } // ruby mace + public override int LabelNumber => 1073529; // ruby mace [Constructible] public RubyMace() diff --git a/Scripts/Items/Weapons/Maces/SapphireMace.cs b/Scripts/Items/Weapons/Maces/SapphireMace.cs index 77bae70df..68597de05 100644 --- a/Scripts/Items/Weapons/Maces/SapphireMace.cs +++ b/Scripts/Items/Weapons/Maces/SapphireMace.cs @@ -5,7 +5,7 @@ namespace Server.Items { public class SapphireMace : DiamondMace { - public override int LabelNumber{ get{ return 1073531; } } // sapphire mace + public override int LabelNumber => 1073531; // sapphire mace [Constructible] public SapphireMace() diff --git a/Scripts/Items/Weapons/Maces/Scepter.cs b/Scripts/Items/Weapons/Maces/Scepter.cs index 92cd7e09d..9645ab978 100644 --- a/Scripts/Items/Weapons/Maces/Scepter.cs +++ b/Scripts/Items/Weapons/Maces/Scepter.cs @@ -7,22 +7,22 @@ namespace Server.Items [FlippableAttribute( 0x26BC, 0x26C6 )] public class Scepter : BaseBashing { - public override WeaponAbility PrimaryAbility{ get{ return WeaponAbility.CrushingBlow; } } - public override WeaponAbility SecondaryAbility{ get{ return WeaponAbility.MortalStrike; } } + public override WeaponAbility PrimaryAbility => WeaponAbility.CrushingBlow; + public override WeaponAbility SecondaryAbility => WeaponAbility.MortalStrike; - public override int AosStrengthReq{ get{ return 40; } } - public override int AosMinDamage{ get{ return 14; } } - public override int AosMaxDamage{ get{ return 17; } } - public override int AosSpeed{ get{ return 30; } } - public override float MlSpeed{ get{ return 3.50f; } } + public override int AosStrengthReq => 40; + public override int AosMinDamage => 14; + public override int AosMaxDamage => 17; + public override int AosSpeed => 30; + public override float MlSpeed => 3.50f; - public override int OldStrengthReq{ get{ return 40; } } - public override int OldMinDamage{ get{ return 14; } } - public override int OldMaxDamage{ get{ return 17; } } - public override int OldSpeed{ get{ return 30; } } + public override int OldStrengthReq => 40; + public override int OldMinDamage => 14; + public override int OldMaxDamage => 17; + public override int OldSpeed => 30; - public override int InitMinHits{ get{ return 31; } } - public override int InitMaxHits{ get{ return 110; } } + public override int InitMinHits => 31; + public override int InitMaxHits => 110; [Constructible] public Scepter() : base( 0x26BC ) @@ -48,4 +48,4 @@ namespace Server.Items int version = reader.ReadInt(); } } -} \ No newline at end of file +} diff --git a/Scripts/Items/Weapons/Maces/SilverEtchedMace.cs b/Scripts/Items/Weapons/Maces/SilverEtchedMace.cs index 58adcf3d8..9a94874f3 100644 --- a/Scripts/Items/Weapons/Maces/SilverEtchedMace.cs +++ b/Scripts/Items/Weapons/Maces/SilverEtchedMace.cs @@ -5,7 +5,7 @@ namespace Server.Items { public class SilverEtchedMace : DiamondMace { - public override int LabelNumber{ get{ return 1073532; } } // silver-etched mace + public override int LabelNumber => 1073532; // silver-etched mace [Constructible] public SilverEtchedMace() diff --git a/Scripts/Items/Weapons/Maces/WarHammer.cs b/Scripts/Items/Weapons/Maces/WarHammer.cs index ed7973337..d1b62363b 100644 --- a/Scripts/Items/Weapons/Maces/WarHammer.cs +++ b/Scripts/Items/Weapons/Maces/WarHammer.cs @@ -7,24 +7,24 @@ namespace Server.Items [FlippableAttribute( 0x1439, 0x1438 )] public class WarHammer : BaseBashing { - public override WeaponAbility PrimaryAbility{ get{ return WeaponAbility.WhirlwindAttack; } } - public override WeaponAbility SecondaryAbility{ get{ return WeaponAbility.CrushingBlow; } } + public override WeaponAbility PrimaryAbility => WeaponAbility.WhirlwindAttack; + public override WeaponAbility SecondaryAbility => WeaponAbility.CrushingBlow; - public override int AosStrengthReq{ get{ return 95; } } - public override int AosMinDamage{ get{ return 17; } } - public override int AosMaxDamage{ get{ return 18; } } - public override int AosSpeed{ get{ return 28; } } - public override float MlSpeed{ get{ return 3.75f; } } + public override int AosStrengthReq => 95; + public override int AosMinDamage => 17; + public override int AosMaxDamage => 18; + public override int AosSpeed => 28; + public override float MlSpeed => 3.75f; - public override int OldStrengthReq{ get{ return 40; } } - public override int OldMinDamage{ get{ return 8; } } - public override int OldMaxDamage{ get{ return 36; } } - public override int OldSpeed{ get{ return 31; } } + public override int OldStrengthReq => 40; + public override int OldMinDamage => 8; + public override int OldMaxDamage => 36; + public override int OldSpeed => 31; - public override int InitMinHits{ get{ return 31; } } - public override int InitMaxHits{ get{ return 110; } } + public override int InitMinHits => 31; + public override int InitMaxHits => 110; - public override WeaponAnimation DefAnimation{ get{ return WeaponAnimation.Bash2H; } } + public override WeaponAnimation DefAnimation => WeaponAnimation.Bash2H; [Constructible] public WarHammer() : base( 0x1439 ) @@ -51,4 +51,4 @@ namespace Server.Items int version = reader.ReadInt(); } } -} \ No newline at end of file +} diff --git a/Scripts/Items/Weapons/Maces/WarMace.cs b/Scripts/Items/Weapons/Maces/WarMace.cs index 565f9406a..c87062d6e 100644 --- a/Scripts/Items/Weapons/Maces/WarMace.cs +++ b/Scripts/Items/Weapons/Maces/WarMace.cs @@ -7,22 +7,22 @@ namespace Server.Items [FlippableAttribute( 0x1407, 0x1406 )] public class WarMace : BaseBashing { - public override WeaponAbility PrimaryAbility{ get{ return WeaponAbility.CrushingBlow; } } - public override WeaponAbility SecondaryAbility{ get{ return WeaponAbility.MortalStrike; } } + public override WeaponAbility PrimaryAbility => WeaponAbility.CrushingBlow; + public override WeaponAbility SecondaryAbility => WeaponAbility.MortalStrike; - public override int AosStrengthReq{ get{ return 80; } } - public override int AosMinDamage{ get{ return 16; } } - public override int AosMaxDamage{ get{ return 17; } } - public override int AosSpeed{ get{ return 26; } } - public override float MlSpeed{ get{ return 4.00f; } } + public override int AosStrengthReq => 80; + public override int AosMinDamage => 16; + public override int AosMaxDamage => 17; + public override int AosSpeed => 26; + public override float MlSpeed => 4.00f; - public override int OldStrengthReq{ get{ return 30; } } - public override int OldMinDamage{ get{ return 10; } } - public override int OldMaxDamage{ get{ return 30; } } - public override int OldSpeed{ get{ return 32; } } + public override int OldStrengthReq => 30; + public override int OldMinDamage => 10; + public override int OldMaxDamage => 30; + public override int OldSpeed => 32; - public override int InitMinHits{ get{ return 31; } } - public override int InitMaxHits{ get{ return 110; } } + public override int InitMinHits => 31; + public override int InitMaxHits => 110; [Constructible] public WarMace() : base( 0x1407 ) @@ -48,4 +48,4 @@ namespace Server.Items int version = reader.ReadInt(); } } -} \ No newline at end of file +} diff --git a/Scripts/Items/Weapons/PoleArms/Bardiche.cs b/Scripts/Items/Weapons/PoleArms/Bardiche.cs index a406f2f60..de686f339 100644 --- a/Scripts/Items/Weapons/PoleArms/Bardiche.cs +++ b/Scripts/Items/Weapons/PoleArms/Bardiche.cs @@ -7,22 +7,22 @@ namespace Server.Items [FlippableAttribute( 0xF4D, 0xF4E )] public class Bardiche : BasePoleArm { - public override WeaponAbility PrimaryAbility{ get{ return WeaponAbility.ParalyzingBlow; } } - public override WeaponAbility SecondaryAbility{ get{ return WeaponAbility.Dismount; } } + public override WeaponAbility PrimaryAbility => WeaponAbility.ParalyzingBlow; + public override WeaponAbility SecondaryAbility => WeaponAbility.Dismount; - public override int AosStrengthReq{ get{ return 45; } } - public override int AosMinDamage{ get{ return 17; } } - public override int AosMaxDamage{ get{ return 18; } } - public override int AosSpeed{ get{ return 28; } } - public override float MlSpeed{ get{ return 3.75f; } } + public override int AosStrengthReq => 45; + public override int AosMinDamage => 17; + public override int AosMaxDamage => 18; + public override int AosSpeed => 28; + public override float MlSpeed => 3.75f; - public override int OldStrengthReq{ get{ return 40; } } - public override int OldMinDamage{ get{ return 5; } } - public override int OldMaxDamage{ get{ return 43; } } - public override int OldSpeed{ get{ return 26; } } + public override int OldStrengthReq => 40; + public override int OldMinDamage => 5; + public override int OldMaxDamage => 43; + public override int OldSpeed => 26; - public override int InitMinHits{ get{ return 31; } } - public override int InitMaxHits{ get{ return 100; } } + public override int InitMinHits => 31; + public override int InitMaxHits => 100; [Constructible] public Bardiche() : base( 0xF4D ) @@ -48,4 +48,4 @@ namespace Server.Items int version = reader.ReadInt(); } } -} \ No newline at end of file +} diff --git a/Scripts/Items/Weapons/PoleArms/BasePoleArm.cs b/Scripts/Items/Weapons/PoleArms/BasePoleArm.cs index 678c61eff..1dee40ac6 100644 --- a/Scripts/Items/Weapons/PoleArms/BasePoleArm.cs +++ b/Scripts/Items/Weapons/PoleArms/BasePoleArm.cs @@ -10,12 +10,12 @@ namespace Server.Items { public abstract class BasePoleArm : BaseMeleeWeapon, IUsesRemaining { - public override int DefHitSound{ get{ return 0x237; } } - public override int DefMissSound{ get{ return 0x238; } } + public override int DefHitSound => 0x237; + public override int DefMissSound => 0x238; - public override SkillName DefSkill{ get{ return SkillName.Swords; } } - public override WeaponType DefType{ get{ return WeaponType.Polearm; } } - public override WeaponAnimation DefAnimation{ get{ return WeaponAnimation.Slash2H; } } + public override SkillName DefSkill => SkillName.Swords; + public override WeaponType DefType => WeaponType.Polearm; + public override WeaponAnimation DefAnimation => WeaponAnimation.Slash2H; public virtual HarvestSystem HarvestSystem{ get{ return Lumberjacking.System; } } @@ -122,4 +122,4 @@ namespace Server.Items } } } -} \ No newline at end of file +} diff --git a/Scripts/Items/Weapons/PoleArms/Halberd.cs b/Scripts/Items/Weapons/PoleArms/Halberd.cs index 786eb3a73..a4e3f4ff5 100644 --- a/Scripts/Items/Weapons/PoleArms/Halberd.cs +++ b/Scripts/Items/Weapons/PoleArms/Halberd.cs @@ -7,22 +7,22 @@ namespace Server.Items [FlippableAttribute( 0x143E, 0x143F )] public class Halberd : BasePoleArm { - public override WeaponAbility PrimaryAbility{ get{ return WeaponAbility.WhirlwindAttack; } } - public override WeaponAbility SecondaryAbility{ get{ return WeaponAbility.ConcussionBlow; } } + public override WeaponAbility PrimaryAbility => WeaponAbility.WhirlwindAttack; + public override WeaponAbility SecondaryAbility => WeaponAbility.ConcussionBlow; - public override int AosStrengthReq{ get{ return 95; } } - public override int AosMinDamage{ get{ return 18; } } - public override int AosMaxDamage{ get{ return 19; } } - public override int AosSpeed{ get{ return 25; } } - public override float MlSpeed{ get{ return 4.25f; } } + public override int AosStrengthReq => 95; + public override int AosMinDamage => 18; + public override int AosMaxDamage => 19; + public override int AosSpeed => 25; + public override float MlSpeed => 4.25f; - public override int OldStrengthReq{ get{ return 45; } } - public override int OldMinDamage{ get{ return 5; } } - public override int OldMaxDamage{ get{ return 49; } } - public override int OldSpeed{ get{ return 25; } } + public override int OldStrengthReq => 45; + public override int OldMinDamage => 5; + public override int OldMaxDamage => 49; + public override int OldSpeed => 25; - public override int InitMinHits{ get{ return 31; } } - public override int InitMaxHits{ get{ return 80; } } + public override int InitMinHits => 31; + public override int InitMaxHits => 80; [Constructible] public Halberd() : base( 0x143E ) @@ -48,4 +48,4 @@ namespace Server.Items int version = reader.ReadInt(); } } -} \ No newline at end of file +} diff --git a/Scripts/Items/Weapons/PoleArms/Scythe.cs b/Scripts/Items/Weapons/PoleArms/Scythe.cs index 0c109455a..8ad3c3150 100644 --- a/Scripts/Items/Weapons/PoleArms/Scythe.cs +++ b/Scripts/Items/Weapons/PoleArms/Scythe.cs @@ -8,24 +8,24 @@ namespace Server.Items [FlippableAttribute( 0x26BA, 0x26C4 )] public class Scythe : BasePoleArm { - public override WeaponAbility PrimaryAbility{ get{ return WeaponAbility.BleedAttack; } } - public override WeaponAbility SecondaryAbility{ get{ return WeaponAbility.ParalyzingBlow; } } + public override WeaponAbility PrimaryAbility => WeaponAbility.BleedAttack; + public override WeaponAbility SecondaryAbility => WeaponAbility.ParalyzingBlow; - public override int AosStrengthReq{ get{ return 45; } } - public override int AosMinDamage{ get{ return 15; } } - public override int AosMaxDamage{ get{ return 18; } } - public override int AosSpeed{ get{ return 32; } } - public override float MlSpeed{ get{ return 3.50f; } } + public override int AosStrengthReq => 45; + public override int AosMinDamage => 15; + public override int AosMaxDamage => 18; + public override int AosSpeed => 32; + public override float MlSpeed => 3.50f; - public override int OldStrengthReq{ get{ return 45; } } - public override int OldMinDamage{ get{ return 15; } } - public override int OldMaxDamage{ get{ return 18; } } - public override int OldSpeed{ get{ return 32; } } + public override int OldStrengthReq => 45; + public override int OldMinDamage => 15; + public override int OldMaxDamage => 18; + public override int OldSpeed => 32; - public override int InitMinHits{ get{ return 31; } } - public override int InitMaxHits{ get{ return 100; } } + public override int InitMinHits => 31; + public override int InitMaxHits => 100; - public override HarvestSystem HarvestSystem{ get{ return null; } } + public override HarvestSystem HarvestSystem => null; [Constructible] public Scythe() : base( 0x26BA ) @@ -54,4 +54,4 @@ namespace Server.Items Weight = 5.0; } } -} \ No newline at end of file +} diff --git a/Scripts/Items/Weapons/Ranged/AssassinsShortbow.cs b/Scripts/Items/Weapons/Ranged/AssassinsShortbow.cs index c764f39c8..aaacfc5bb 100644 --- a/Scripts/Items/Weapons/Ranged/AssassinsShortbow.cs +++ b/Scripts/Items/Weapons/Ranged/AssassinsShortbow.cs @@ -5,7 +5,7 @@ namespace Server.Items { public class AssassinsShortbow : MagicalShortbow { - public override int LabelNumber{ get{ return 1073512; } } // assassin's shortbow + public override int LabelNumber => 1073512; // assassin's shortbow [Constructible] public AssassinsShortbow() diff --git a/Scripts/Items/Weapons/Ranged/BarbedLongbow.cs b/Scripts/Items/Weapons/Ranged/BarbedLongbow.cs index fe6c3b74a..04a5452ba 100644 --- a/Scripts/Items/Weapons/Ranged/BarbedLongbow.cs +++ b/Scripts/Items/Weapons/Ranged/BarbedLongbow.cs @@ -5,7 +5,7 @@ namespace Server.Items { public class BarbedLongbow : ElvenCompositeLongbow { - public override int LabelNumber{ get{ return 1073505; } } // barbed longbow + public override int LabelNumber => 1073505; // barbed longbow [Constructible] public BarbedLongbow() diff --git a/Scripts/Items/Weapons/Ranged/BaseRanged.cs b/Scripts/Items/Weapons/Ranged/BaseRanged.cs index 02ba415f3..323e9e8ec 100644 --- a/Scripts/Items/Weapons/Ranged/BaseRanged.cs +++ b/Scripts/Items/Weapons/Ranged/BaseRanged.cs @@ -12,26 +12,26 @@ namespace Server.Items public abstract Type AmmoType{ get; } public abstract Item Ammo{ get; } - public override int DefHitSound{ get{ return 0x234; } } - public override int DefMissSound{ get{ return 0x238; } } + public override int DefHitSound => 0x234; + public override int DefMissSound => 0x238; - public override SkillName DefSkill{ get{ return SkillName.Archery; } } - public override WeaponType DefType{ get{ return WeaponType.Ranged; } } - public override WeaponAnimation DefAnimation{ get{ return WeaponAnimation.ShootXBow; } } + public override SkillName DefSkill => SkillName.Archery; + public override WeaponType DefType => WeaponType.Ranged; + public override WeaponAnimation DefAnimation => WeaponAnimation.ShootXBow; - public override SkillName AccuracySkill{ get{ return SkillName.Archery; } } + public override SkillName AccuracySkill => SkillName.Archery; private Timer m_RecoveryTimer; // so we don't start too many timers private bool m_Balanced; private int m_Velocity; - + [CommandProperty( AccessLevel.GameMaster )] public bool Balanced { get{ return m_Balanced; } set{ m_Balanced = value; InvalidateProperties(); } } - + [CommandProperty( AccessLevel.GameMaster )] public int Velocity { @@ -233,4 +233,4 @@ namespace Server.Items } } } -} \ No newline at end of file +} diff --git a/Scripts/Items/Weapons/Ranged/Bow.cs b/Scripts/Items/Weapons/Ranged/Bow.cs index 18aef9072..4678efd14 100644 --- a/Scripts/Items/Weapons/Ranged/Bow.cs +++ b/Scripts/Items/Weapons/Ranged/Bow.cs @@ -7,30 +7,30 @@ namespace Server.Items [FlippableAttribute( 0x13B2, 0x13B1 )] public class Bow : BaseRanged { - public override int EffectID{ get{ return 0xF42; } } - public override Type AmmoType{ get{ return typeof( Arrow ); } } - public override Item Ammo{ get{ return new Arrow(); } } + public override int EffectID => 0xF42; + public override Type AmmoType => typeof( Arrow ); + public override Item Ammo => new Arrow(); - public override WeaponAbility PrimaryAbility{ get{ return WeaponAbility.ParalyzingBlow; } } - public override WeaponAbility SecondaryAbility{ get{ return WeaponAbility.MortalStrike; } } + public override WeaponAbility PrimaryAbility => WeaponAbility.ParalyzingBlow; + public override WeaponAbility SecondaryAbility => WeaponAbility.MortalStrike; - public override int AosStrengthReq{ get{ return 30; } } - public override int AosMinDamage{ get{ return Core.ML ? 15 : 16; } } - public override int AosMaxDamage{ get{ return Core.ML ? 19 : 18; } } - public override int AosSpeed{ get{ return 25; } } - public override float MlSpeed{ get{ return 4.25f; } } + public override int AosStrengthReq => 30; + public override int AosMinDamage => Core.ML ? 15 : 16; + public override int AosMaxDamage => Core.ML ? 19 : 18; + public override int AosSpeed => 25; + public override float MlSpeed => 4.25f; - public override int OldStrengthReq{ get{ return 20; } } - public override int OldMinDamage{ get{ return 9; } } - public override int OldMaxDamage{ get{ return 41; } } - public override int OldSpeed{ get{ return 20; } } + public override int OldStrengthReq => 20; + public override int OldMinDamage => 9; + public override int OldMaxDamage => 41; + public override int OldSpeed => 20; - public override int DefMaxRange{ get{ return 10; } } + public override int DefMaxRange => 10; - public override int InitMinHits{ get{ return 31; } } - public override int InitMaxHits{ get{ return 60; } } + public override int InitMinHits => 31; + public override int InitMaxHits => 60; - public override WeaponAnimation DefAnimation{ get{ return WeaponAnimation.ShootBow; } } + public override WeaponAnimation DefAnimation => WeaponAnimation.ShootBow; [Constructible] public Bow() : base( 0x13B2 ) @@ -60,4 +60,4 @@ namespace Server.Items Weight = 6.0; } } -} \ No newline at end of file +} diff --git a/Scripts/Items/Weapons/Ranged/CompositeBow.cs b/Scripts/Items/Weapons/Ranged/CompositeBow.cs index 7ed539168..400d9f639 100644 --- a/Scripts/Items/Weapons/Ranged/CompositeBow.cs +++ b/Scripts/Items/Weapons/Ranged/CompositeBow.cs @@ -7,30 +7,30 @@ namespace Server.Items [FlippableAttribute( 0x26C2, 0x26CC )] public class CompositeBow : BaseRanged { - public override int EffectID{ get{ return 0xF42; } } - public override Type AmmoType{ get{ return typeof( Arrow ); } } - public override Item Ammo{ get{ return new Arrow(); } } + public override int EffectID => 0xF42; + public override Type AmmoType => typeof( Arrow ); + public override Item Ammo => new Arrow(); - public override WeaponAbility PrimaryAbility{ get{ return WeaponAbility.ArmorIgnore; } } - public override WeaponAbility SecondaryAbility{ get{ return WeaponAbility.MovingShot; } } + public override WeaponAbility PrimaryAbility => WeaponAbility.ArmorIgnore; + public override WeaponAbility SecondaryAbility => WeaponAbility.MovingShot; - public override int AosStrengthReq{ get{ return 45; } } - public override int AosMinDamage{ get{ return Core.ML ? 13 : 15; } } - public override int AosMaxDamage{ get{ return 17; } } - public override int AosSpeed{ get{ return 25; } } - public override float MlSpeed{ get{ return 4.00f; } } + public override int AosStrengthReq => 45; + public override int AosMinDamage => Core.ML ? 13 : 15; + public override int AosMaxDamage => 17; + public override int AosSpeed => 25; + public override float MlSpeed => 4.00f; - public override int OldStrengthReq{ get{ return 45; } } - public override int OldMinDamage{ get{ return 15; } } - public override int OldMaxDamage{ get{ return 17; } } - public override int OldSpeed{ get{ return 25; } } + public override int OldStrengthReq => 45; + public override int OldMinDamage => 15; + public override int OldMaxDamage => 17; + public override int OldSpeed => 25; - public override int DefMaxRange{ get{ return 10; } } + public override int DefMaxRange => 10; - public override int InitMinHits{ get{ return 31; } } - public override int InitMaxHits{ get{ return 70; } } + public override int InitMinHits => 31; + public override int InitMaxHits => 70; - public override WeaponAnimation DefAnimation{ get{ return WeaponAnimation.ShootBow; } } + public override WeaponAnimation DefAnimation => WeaponAnimation.ShootBow; [Constructible] public CompositeBow() : base( 0x26C2 ) @@ -56,4 +56,4 @@ namespace Server.Items int version = reader.ReadInt(); } } -} \ No newline at end of file +} diff --git a/Scripts/Items/Weapons/Ranged/Crossbow.cs b/Scripts/Items/Weapons/Ranged/Crossbow.cs index 9d6132938..17517502a 100644 --- a/Scripts/Items/Weapons/Ranged/Crossbow.cs +++ b/Scripts/Items/Weapons/Ranged/Crossbow.cs @@ -7,28 +7,28 @@ namespace Server.Items [FlippableAttribute( 0xF50, 0xF4F )] public class Crossbow : BaseRanged { - public override int EffectID{ get{ return 0x1BFE; } } - public override Type AmmoType{ get{ return typeof( Bolt ); } } - public override Item Ammo{ get{ return new Bolt(); } } + public override int EffectID => 0x1BFE; + public override Type AmmoType => typeof( Bolt ); + public override Item Ammo => new Bolt(); - public override WeaponAbility PrimaryAbility{ get{ return WeaponAbility.ConcussionBlow; } } - public override WeaponAbility SecondaryAbility{ get{ return WeaponAbility.MortalStrike; } } + public override WeaponAbility PrimaryAbility => WeaponAbility.ConcussionBlow; + public override WeaponAbility SecondaryAbility => WeaponAbility.MortalStrike; - public override int AosStrengthReq{ get{ return 35; } } - public override int AosMinDamage{ get{ return 18; } } - public override int AosMaxDamage{ get{ return Core.ML ? 22 : 20; } } - public override int AosSpeed{ get{ return 24; } } - public override float MlSpeed{ get{ return 4.50f; } } + public override int AosStrengthReq => 35; + public override int AosMinDamage => 18; + public override int AosMaxDamage => Core.ML ? 22 : 20; + public override int AosSpeed => 24; + public override float MlSpeed => 4.50f; - public override int OldStrengthReq{ get{ return 30; } } - public override int OldMinDamage{ get{ return 8; } } - public override int OldMaxDamage{ get{ return 43; } } - public override int OldSpeed{ get{ return 18; } } + public override int OldStrengthReq => 30; + public override int OldMinDamage => 8; + public override int OldMaxDamage => 43; + public override int OldSpeed => 18; - public override int DefMaxRange{ get{ return 8; } } + public override int DefMaxRange => 8; - public override int InitMinHits{ get{ return 31; } } - public override int InitMaxHits{ get{ return 80; } } + public override int InitMinHits => 31; + public override int InitMaxHits => 80; [Constructible] public Crossbow() : base( 0xF50 ) @@ -55,4 +55,4 @@ namespace Server.Items int version = reader.ReadInt(); } } -} \ No newline at end of file +} diff --git a/Scripts/Items/Weapons/Ranged/FrozenLongbow.cs b/Scripts/Items/Weapons/Ranged/FrozenLongbow.cs index 50533c96e..0580470f7 100644 --- a/Scripts/Items/Weapons/Ranged/FrozenLongbow.cs +++ b/Scripts/Items/Weapons/Ranged/FrozenLongbow.cs @@ -5,7 +5,7 @@ namespace Server.Items { public class FrozenLongbow : ElvenCompositeLongbow { - public override int LabelNumber{ get{ return 1073507; } } // frozen longbow + public override int LabelNumber => 1073507; // frozen longbow [Constructible] public FrozenLongbow() diff --git a/Scripts/Items/Weapons/Ranged/HeavyCrossbow.cs b/Scripts/Items/Weapons/Ranged/HeavyCrossbow.cs index 408dc5050..9f26c6fb4 100644 --- a/Scripts/Items/Weapons/Ranged/HeavyCrossbow.cs +++ b/Scripts/Items/Weapons/Ranged/HeavyCrossbow.cs @@ -7,28 +7,28 @@ namespace Server.Items [FlippableAttribute( 0x13FD, 0x13FC )] public class HeavyCrossbow : BaseRanged { - public override int EffectID{ get{ return 0x1BFE; } } - public override Type AmmoType{ get{ return typeof( Bolt ); } } - public override Item Ammo{ get{ return new Bolt(); } } + public override int EffectID => 0x1BFE; + public override Type AmmoType => typeof( Bolt ); + public override Item Ammo => new Bolt(); - public override WeaponAbility PrimaryAbility{ get{ return WeaponAbility.MovingShot; } } - public override WeaponAbility SecondaryAbility{ get{ return WeaponAbility.Dismount; } } + public override WeaponAbility PrimaryAbility => WeaponAbility.MovingShot; + public override WeaponAbility SecondaryAbility => WeaponAbility.Dismount; - public override int AosStrengthReq{ get{ return 80; } } - public override int AosMinDamage{ get{ return Core.ML ? 20 : 19; } } - public override int AosMaxDamage{ get{ return Core.ML ? 24 : 20; } } - public override int AosSpeed{ get{ return 22; } } - public override float MlSpeed{ get{ return 5.00f; } } + public override int AosStrengthReq => 80; + public override int AosMinDamage => Core.ML ? 20 : 19; + public override int AosMaxDamage => Core.ML ? 24 : 20; + public override int AosSpeed => 22; + public override float MlSpeed => 5.00f; - public override int OldStrengthReq{ get{ return 40; } } - public override int OldMinDamage{ get{ return 11; } } - public override int OldMaxDamage{ get{ return 56; } } - public override int OldSpeed{ get{ return 10; } } + public override int OldStrengthReq => 40; + public override int OldMinDamage => 11; + public override int OldMaxDamage => 56; + public override int OldSpeed => 10; - public override int DefMaxRange{ get{ return 8; } } + public override int DefMaxRange => 8; - public override int InitMinHits{ get{ return 31; } } - public override int InitMaxHits{ get{ return 100; } } + public override int InitMinHits => 31; + public override int InitMaxHits => 100; [Constructible] public HeavyCrossbow() : base( 0x13FD ) @@ -55,4 +55,4 @@ namespace Server.Items int version = reader.ReadInt(); } } -} \ No newline at end of file +} diff --git a/Scripts/Items/Weapons/Ranged/JukaBow.cs b/Scripts/Items/Weapons/Ranged/JukaBow.cs index 9ea460fc5..92fbf2b73 100644 --- a/Scripts/Items/Weapons/Ranged/JukaBow.cs +++ b/Scripts/Items/Weapons/Ranged/JukaBow.cs @@ -7,11 +7,11 @@ namespace Server.Items [FlippableAttribute( 0x13B2, 0x13B1 )] public class JukaBow : Bow { - public override int AosStrengthReq{ get{ return 80; } } - public override int AosDexterityReq{ get{ return 80; } } + public override int AosStrengthReq => 80; + public override int AosDexterityReq => 80; - public override int OldStrengthReq{ get{ return 80; } } - public override int OldDexterityReq{ get{ return 80; } } + public override int OldStrengthReq => 80; + public override int OldDexterityReq => 80; [CommandProperty( AccessLevel.GameMaster )] public bool IsModified @@ -94,4 +94,4 @@ namespace Server.Items int version = reader.ReadInt(); } } -} \ No newline at end of file +} diff --git a/Scripts/Items/Weapons/Ranged/LightweightShortbow.cs b/Scripts/Items/Weapons/Ranged/LightweightShortbow.cs index a2de38d41..abc2dfa1a 100644 --- a/Scripts/Items/Weapons/Ranged/LightweightShortbow.cs +++ b/Scripts/Items/Weapons/Ranged/LightweightShortbow.cs @@ -5,7 +5,7 @@ namespace Server.Items { public class LightweightShortbow : MagicalShortbow { - public override int LabelNumber{ get{ return 1073510; } } // lightweight shortbow + public override int LabelNumber => 1073510; // lightweight shortbow [Constructible] public LightweightShortbow() diff --git a/Scripts/Items/Weapons/Ranged/LongbowOfMight.cs b/Scripts/Items/Weapons/Ranged/LongbowOfMight.cs index d27e9a744..35bd3777d 100644 --- a/Scripts/Items/Weapons/Ranged/LongbowOfMight.cs +++ b/Scripts/Items/Weapons/Ranged/LongbowOfMight.cs @@ -5,7 +5,7 @@ namespace Server.Items { public class LongbowOfMight : ElvenCompositeLongbow { - public override int LabelNumber{ get{ return 1073508; } } // longbow of might + public override int LabelNumber => 1073508; // longbow of might [Constructible] public LongbowOfMight() diff --git a/Scripts/Items/Weapons/Ranged/MysticalShortbow.cs b/Scripts/Items/Weapons/Ranged/MysticalShortbow.cs index 886ffee39..0937eab69 100644 --- a/Scripts/Items/Weapons/Ranged/MysticalShortbow.cs +++ b/Scripts/Items/Weapons/Ranged/MysticalShortbow.cs @@ -5,7 +5,7 @@ namespace Server.Items { public class MysticalShortbow : MagicalShortbow { - public override int LabelNumber{ get{ return 1073511; } } // mystical shortbow + public override int LabelNumber => 1073511; // mystical shortbow [Constructible] public MysticalShortbow() diff --git a/Scripts/Items/Weapons/Ranged/RangersShortbow.cs b/Scripts/Items/Weapons/Ranged/RangersShortbow.cs index a08b7a77b..6f3944144 100644 --- a/Scripts/Items/Weapons/Ranged/RangersShortbow.cs +++ b/Scripts/Items/Weapons/Ranged/RangersShortbow.cs @@ -5,7 +5,7 @@ namespace Server.Items { public class RangersShortbow : MagicalShortbow { - public override int LabelNumber{ get{ return 1073509; } } // ranger's shortbow + public override int LabelNumber => 1073509; // ranger's shortbow [Constructible] public RangersShortbow() diff --git a/Scripts/Items/Weapons/Ranged/RepeatingCrossbow.cs b/Scripts/Items/Weapons/Ranged/RepeatingCrossbow.cs index ccbc08b67..6328d47c8 100644 --- a/Scripts/Items/Weapons/Ranged/RepeatingCrossbow.cs +++ b/Scripts/Items/Weapons/Ranged/RepeatingCrossbow.cs @@ -7,28 +7,28 @@ namespace Server.Items [FlippableAttribute( 0x26C3, 0x26CD )] public class RepeatingCrossbow : BaseRanged { - public override int EffectID{ get{ return 0x1BFE; } } - public override Type AmmoType{ get{ return typeof( Bolt ); } } - public override Item Ammo{ get{ return new Bolt(); } } + public override int EffectID => 0x1BFE; + public override Type AmmoType => typeof( Bolt ); + public override Item Ammo => new Bolt(); - public override WeaponAbility PrimaryAbility{ get{ return WeaponAbility.DoubleStrike; } } - public override WeaponAbility SecondaryAbility{ get{ return WeaponAbility.MovingShot; } } + public override WeaponAbility PrimaryAbility => WeaponAbility.DoubleStrike; + public override WeaponAbility SecondaryAbility => WeaponAbility.MovingShot; - public override int AosStrengthReq{ get{ return 30; } } - public override int AosMinDamage{ get{ return Core.ML ? 8 : 10; } } - public override int AosMaxDamage{ get{ return 12; } } - public override int AosSpeed{ get{ return 41; } } - public override float MlSpeed{ get{ return 2.75f; } } + public override int AosStrengthReq => 30; + public override int AosMinDamage => Core.ML ? 8 : 10; + public override int AosMaxDamage => 12; + public override int AosSpeed => 41; + public override float MlSpeed => 2.75f; - public override int OldStrengthReq{ get{ return 30; } } - public override int OldMinDamage{ get{ return 10; } } - public override int OldMaxDamage{ get{ return 12; } } - public override int OldSpeed{ get{ return 41; } } + public override int OldStrengthReq => 30; + public override int OldMinDamage => 10; + public override int OldMaxDamage => 12; + public override int OldSpeed => 41; - public override int DefMaxRange{ get{ return 7; } } + public override int DefMaxRange => 7; - public override int InitMinHits{ get{ return 31; } } - public override int InitMaxHits{ get{ return 80; } } + public override int InitMinHits => 31; + public override int InitMaxHits => 80; [Constructible] public RepeatingCrossbow() : base( 0x26C3 ) @@ -54,4 +54,4 @@ namespace Server.Items int version = reader.ReadInt(); } } -} \ No newline at end of file +} diff --git a/Scripts/Items/Weapons/Ranged/SlayerLongbow.cs b/Scripts/Items/Weapons/Ranged/SlayerLongbow.cs index 0c25d1a61..71197f85e 100644 --- a/Scripts/Items/Weapons/Ranged/SlayerLongbow.cs +++ b/Scripts/Items/Weapons/Ranged/SlayerLongbow.cs @@ -5,7 +5,7 @@ namespace Server.Items { public class SlayerLongbow : ElvenCompositeLongbow { - public override int LabelNumber{ get{ return 1073506; } } // slayer longbow + public override int LabelNumber => 1073506; // slayer longbow [Constructible] public SlayerLongbow() diff --git a/Scripts/Items/Weapons/SE Weapons/Bokuto.cs b/Scripts/Items/Weapons/SE Weapons/Bokuto.cs index 6b146397a..9244e4a50 100644 --- a/Scripts/Items/Weapons/SE Weapons/Bokuto.cs +++ b/Scripts/Items/Weapons/SE Weapons/Bokuto.cs @@ -7,25 +7,25 @@ namespace Server.Items [FlippableAttribute( 0x27A8, 0x27F3 )] public class Bokuto : BaseSword { - public override WeaponAbility PrimaryAbility{ get{ return WeaponAbility.Feint; } } - public override WeaponAbility SecondaryAbility{ get{ return WeaponAbility.NerveStrike; } } + public override WeaponAbility PrimaryAbility => WeaponAbility.Feint; + public override WeaponAbility SecondaryAbility => WeaponAbility.NerveStrike; - public override int AosStrengthReq{ get{ return 20; } } - public override int AosMinDamage{ get{ return 9; } } - public override int AosMaxDamage{ get{ return 11; } } - public override int AosSpeed{ get{ return 53; } } - public override float MlSpeed{ get{ return 2.00f; } } + public override int AosStrengthReq => 20; + public override int AosMinDamage => 9; + public override int AosMaxDamage => 11; + public override int AosSpeed => 53; + public override float MlSpeed => 2.00f; - public override int OldStrengthReq{ get{ return 20; } } - public override int OldMinDamage{ get{ return 9; } } - public override int OldMaxDamage{ get{ return 11; } } - public override int OldSpeed{ get{ return 53; } } + public override int OldStrengthReq => 20; + public override int OldMinDamage => 9; + public override int OldMaxDamage => 11; + public override int OldSpeed => 53; - public override int DefHitSound{ get{ return 0x536; } } - public override int DefMissSound{ get{ return 0x23A; } } + public override int DefHitSound => 0x536; + public override int DefMissSound => 0x23A; - public override int InitMinHits{ get{ return 25; } } - public override int InitMaxHits{ get{ return 50; } } + public override int InitMinHits => 25; + public override int InitMaxHits => 50; [Constructible] public Bokuto() : base( 0x27A8 ) @@ -51,4 +51,4 @@ namespace Server.Items int version = reader.ReadInt(); } } -} \ No newline at end of file +} diff --git a/Scripts/Items/Weapons/SE Weapons/Daisho.cs b/Scripts/Items/Weapons/SE Weapons/Daisho.cs index 5d97b96e6..73272d2af 100644 --- a/Scripts/Items/Weapons/SE Weapons/Daisho.cs +++ b/Scripts/Items/Weapons/SE Weapons/Daisho.cs @@ -7,25 +7,25 @@ namespace Server.Items [FlippableAttribute( 0x27A9, 0x27F4 )] public class Daisho : BaseSword { - public override WeaponAbility PrimaryAbility{ get{ return WeaponAbility.Feint; } } - public override WeaponAbility SecondaryAbility{ get{ return WeaponAbility.DoubleStrike; } } + public override WeaponAbility PrimaryAbility => WeaponAbility.Feint; + public override WeaponAbility SecondaryAbility => WeaponAbility.DoubleStrike; - public override int AosStrengthReq{ get{ return 40; } } - public override int AosMinDamage{ get{ return 13; } } - public override int AosMaxDamage{ get{ return 15; } } - public override int AosSpeed{ get{ return 40; } } - public override float MlSpeed{ get{ return 2.75f; } } + public override int AosStrengthReq => 40; + public override int AosMinDamage => 13; + public override int AosMaxDamage => 15; + public override int AosSpeed => 40; + public override float MlSpeed => 2.75f; - public override int OldStrengthReq{ get{ return 40; } } - public override int OldMinDamage{ get{ return 13; } } - public override int OldMaxDamage{ get{ return 15; } } - public override int OldSpeed{ get{ return 40; } } + public override int OldStrengthReq => 40; + public override int OldMinDamage => 13; + public override int OldMaxDamage => 15; + public override int OldSpeed => 40; - public override int DefHitSound{ get{ return 0x23B; } } - public override int DefMissSound{ get{ return 0x23A; } } + public override int DefHitSound => 0x23B; + public override int DefMissSound => 0x23A; - public override int InitMinHits{ get{ return 45; } } - public override int InitMaxHits{ get{ return 65; } } + public override int InitMinHits => 45; + public override int InitMaxHits => 65; [Constructible] public Daisho() : base( 0x27A9 ) @@ -52,4 +52,4 @@ namespace Server.Items int version = reader.ReadInt(); } } -} \ No newline at end of file +} diff --git a/Scripts/Items/Weapons/SE Weapons/Kama.cs b/Scripts/Items/Weapons/SE Weapons/Kama.cs index 643fdcec2..0270850dc 100644 --- a/Scripts/Items/Weapons/SE Weapons/Kama.cs +++ b/Scripts/Items/Weapons/SE Weapons/Kama.cs @@ -7,29 +7,29 @@ namespace Server.Items [FlippableAttribute( 0x27AD, 0x27F8 )] public class Kama : BaseKnife { - public override WeaponAbility PrimaryAbility{ get{ return WeaponAbility.WhirlwindAttack; } } - public override WeaponAbility SecondaryAbility{ get{ return WeaponAbility.DefenseMastery; } } + public override WeaponAbility PrimaryAbility => WeaponAbility.WhirlwindAttack; + public override WeaponAbility SecondaryAbility => WeaponAbility.DefenseMastery; - public override int AosStrengthReq{ get{ return 15; } } - public override int AosMinDamage{ get{ return 9; } } - public override int AosMaxDamage{ get{ return 11; } } - public override int AosSpeed{ get{ return 55; } } - public override float MlSpeed{ get{ return 2.00f; } } + public override int AosStrengthReq => 15; + public override int AosMinDamage => 9; + public override int AosMaxDamage => 11; + public override int AosSpeed => 55; + public override float MlSpeed => 2.00f; - public override int OldStrengthReq{ get{ return 15; } } - public override int OldMinDamage{ get{ return 9; } } - public override int OldMaxDamage{ get{ return 11; } } - public override int OldSpeed{ get{ return 55; } } + public override int OldStrengthReq => 15; + public override int OldMinDamage => 9; + public override int OldMaxDamage => 11; + public override int OldSpeed => 55; - public override int DefHitSound{ get{ return 0x232; } } - public override int DefMissSound{ get{ return 0x238; } } + public override int DefHitSound => 0x232; + public override int DefMissSound => 0x238; - public override int InitMinHits{ get{ return 35; } } - public override int InitMaxHits{ get{ return 60; } } + public override int InitMinHits => 35; + public override int InitMaxHits => 60; - public override SkillName DefSkill{ get{ return SkillName.Fencing; } } - public override WeaponType DefType{ get{ return WeaponType.Piercing; } } - public override WeaponAnimation DefAnimation{ get{ return WeaponAnimation.Pierce1H; } } + public override SkillName DefSkill => SkillName.Fencing; + public override WeaponType DefType => WeaponType.Piercing; + public override WeaponAnimation DefAnimation => WeaponAnimation.Pierce1H; [Constructible] public Kama() : base( 0x27AD ) @@ -56,4 +56,4 @@ namespace Server.Items int version = reader.ReadInt(); } } -} \ No newline at end of file +} diff --git a/Scripts/Items/Weapons/SE Weapons/Lajatang.cs b/Scripts/Items/Weapons/SE Weapons/Lajatang.cs index eaae78bc9..33fbc189d 100644 --- a/Scripts/Items/Weapons/SE Weapons/Lajatang.cs +++ b/Scripts/Items/Weapons/SE Weapons/Lajatang.cs @@ -7,29 +7,29 @@ namespace Server.Items [FlippableAttribute( 0x27A7, 0x27F2 )] public class Lajatang : BaseKnife { - public override WeaponAbility PrimaryAbility{ get{ return WeaponAbility.DefenseMastery; } } - public override WeaponAbility SecondaryAbility{ get{ return WeaponAbility.FrenziedWhirlwind; } } + public override WeaponAbility PrimaryAbility => WeaponAbility.DefenseMastery; + public override WeaponAbility SecondaryAbility => WeaponAbility.FrenziedWhirlwind; - public override int AosStrengthReq{ get{ return 65; } } - public override int AosMinDamage{ get{ return 16; } } - public override int AosMaxDamage{ get{ return 18; } } - public override int AosSpeed{ get{ return 32; } } - public override float MlSpeed{ get{ return 3.50f; } } + public override int AosStrengthReq => 65; + public override int AosMinDamage => 16; + public override int AosMaxDamage => 18; + public override int AosSpeed => 32; + public override float MlSpeed => 3.50f; - public override int OldStrengthReq{ get{ return 65; } } - public override int OldMinDamage{ get{ return 16; } } - public override int OldMaxDamage{ get{ return 18; } } - public override int OldSpeed{ get{ return 55; } } + public override int OldStrengthReq => 65; + public override int OldMinDamage => 16; + public override int OldMaxDamage => 18; + public override int OldSpeed => 55; - public override int DefHitSound{ get{ return 0x232; } } - public override int DefMissSound{ get{ return 0x238; } } + public override int DefHitSound => 0x232; + public override int DefMissSound => 0x238; - public override int InitMinHits{ get{ return 90; } } - public override int InitMaxHits{ get{ return 95; } } + public override int InitMinHits => 90; + public override int InitMaxHits => 95; - public override SkillName DefSkill{ get{ return SkillName.Fencing; } } - public override WeaponType DefType{ get{ return WeaponType.Piercing; } } - public override WeaponAnimation DefAnimation{ get{ return WeaponAnimation.Pierce1H; } } + public override SkillName DefSkill => SkillName.Fencing; + public override WeaponType DefType => WeaponType.Piercing; + public override WeaponAnimation DefAnimation => WeaponAnimation.Pierce1H; [Constructible] public Lajatang() : base( 0x27A7 ) @@ -56,4 +56,4 @@ namespace Server.Items int version = reader.ReadInt(); } } -} \ No newline at end of file +} diff --git a/Scripts/Items/Weapons/SE Weapons/NoDachi.cs b/Scripts/Items/Weapons/SE Weapons/NoDachi.cs index 30439a948..71f967671 100644 --- a/Scripts/Items/Weapons/SE Weapons/NoDachi.cs +++ b/Scripts/Items/Weapons/SE Weapons/NoDachi.cs @@ -7,25 +7,25 @@ namespace Server.Items [FlippableAttribute( 0x27A2, 0x27ED )] public class NoDachi : BaseSword { - public override WeaponAbility PrimaryAbility{ get{ return WeaponAbility.CrushingBlow; } } - public override WeaponAbility SecondaryAbility{ get{ return WeaponAbility.RidingSwipe; } } + public override WeaponAbility PrimaryAbility => WeaponAbility.CrushingBlow; + public override WeaponAbility SecondaryAbility => WeaponAbility.RidingSwipe; - public override int AosStrengthReq{ get{ return 40; } } - public override int AosMinDamage{ get{ return 16; } } - public override int AosMaxDamage{ get{ return 18; } } - public override int AosSpeed{ get{ return 35; } } - public override float MlSpeed{ get{ return 3.50f; } } + public override int AosStrengthReq => 40; + public override int AosMinDamage => 16; + public override int AosMaxDamage => 18; + public override int AosSpeed => 35; + public override float MlSpeed => 3.50f; - public override int OldStrengthReq{ get{ return 40; } } - public override int OldMinDamage{ get{ return 16; } } - public override int OldMaxDamage{ get{ return 18; } } - public override int OldSpeed{ get{ return 35; } } + public override int OldStrengthReq => 40; + public override int OldMinDamage => 16; + public override int OldMaxDamage => 18; + public override int OldSpeed => 35; - public override int DefHitSound{ get{ return 0x23B; } } - public override int DefMissSound{ get{ return 0x23A; } } + public override int DefHitSound => 0x23B; + public override int DefMissSound => 0x23A; - public override int InitMinHits{ get{ return 31; } } - public override int InitMaxHits{ get{ return 90; } } + public override int InitMinHits => 31; + public override int InitMaxHits => 90; [Constructible] public NoDachi() : base( 0x27A2 ) @@ -52,4 +52,4 @@ namespace Server.Items int version = reader.ReadInt(); } } -} \ No newline at end of file +} diff --git a/Scripts/Items/Weapons/SE Weapons/Nunchaku.cs b/Scripts/Items/Weapons/SE Weapons/Nunchaku.cs index 55225238b..d1aae9c6d 100644 --- a/Scripts/Items/Weapons/SE Weapons/Nunchaku.cs +++ b/Scripts/Items/Weapons/SE Weapons/Nunchaku.cs @@ -7,25 +7,25 @@ namespace Server.Items [FlippableAttribute( 0x27AE, 0x27F9 )] public class Nunchaku : BaseBashing { - public override WeaponAbility PrimaryAbility{ get{ return WeaponAbility.Block; } } - public override WeaponAbility SecondaryAbility{ get{ return WeaponAbility.Feint; } } + public override WeaponAbility PrimaryAbility => WeaponAbility.Block; + public override WeaponAbility SecondaryAbility => WeaponAbility.Feint; - public override int AosStrengthReq{ get{ return 15; } } - public override int AosMinDamage{ get{ return 11; } } - public override int AosMaxDamage{ get{ return 13; } } - public override int AosSpeed{ get{ return 47; } } - public override float MlSpeed{ get{ return 2.50f; } } + public override int AosStrengthReq => 15; + public override int AosMinDamage => 11; + public override int AosMaxDamage => 13; + public override int AosSpeed => 47; + public override float MlSpeed => 2.50f; - public override int OldStrengthReq{ get{ return 15; } } - public override int OldMinDamage{ get{ return 11; } } - public override int OldMaxDamage{ get{ return 13; } } - public override int OldSpeed{ get{ return 47; } } + public override int OldStrengthReq => 15; + public override int OldMinDamage => 11; + public override int OldMaxDamage => 13; + public override int OldSpeed => 47; - public override int DefHitSound{ get{ return 0x535; } } - public override int DefMissSound{ get{ return 0x239; } } + public override int DefHitSound => 0x535; + public override int DefMissSound => 0x239; - public override int InitMinHits{ get{ return 40; } } - public override int InitMaxHits{ get{ return 55; } } + public override int InitMinHits => 40; + public override int InitMaxHits => 55; [Constructible] public Nunchaku() : base( 0x27AE ) @@ -51,4 +51,4 @@ namespace Server.Items int version = reader.ReadInt(); } } -} \ No newline at end of file +} diff --git a/Scripts/Items/Weapons/SE Weapons/Sai.cs b/Scripts/Items/Weapons/SE Weapons/Sai.cs index c47394e9d..6fa06bb1c 100644 --- a/Scripts/Items/Weapons/SE Weapons/Sai.cs +++ b/Scripts/Items/Weapons/SE Weapons/Sai.cs @@ -7,29 +7,29 @@ namespace Server.Items [FlippableAttribute( 0x27AF, 0x27FA )] public class Sai : BaseKnife { - public override WeaponAbility PrimaryAbility{ get{ return WeaponAbility.Block; } } - public override WeaponAbility SecondaryAbility{ get{ return WeaponAbility.ArmorPierce; } } + public override WeaponAbility PrimaryAbility => WeaponAbility.Block; + public override WeaponAbility SecondaryAbility => WeaponAbility.ArmorPierce; - public override int AosStrengthReq{ get{ return 15; } } - public override int AosMinDamage{ get{ return 9; } } - public override int AosMaxDamage{ get{ return 11; } } - public override int AosSpeed{ get{ return 55; } } - public override float MlSpeed{ get{ return 2.00f; } } + public override int AosStrengthReq => 15; + public override int AosMinDamage => 9; + public override int AosMaxDamage => 11; + public override int AosSpeed => 55; + public override float MlSpeed => 2.00f; - public override int OldStrengthReq{ get{ return 15; } } - public override int OldMinDamage{ get{ return 9; } } - public override int OldMaxDamage{ get{ return 11; } } - public override int OldSpeed{ get{ return 55; } } + public override int OldStrengthReq => 15; + public override int OldMinDamage => 9; + public override int OldMaxDamage => 11; + public override int OldSpeed => 55; - public override int DefHitSound{ get{ return 0x23C; } } - public override int DefMissSound{ get{ return 0x232; } } + public override int DefHitSound => 0x23C; + public override int DefMissSound => 0x232; - public override int InitMinHits{ get{ return 55; } } - public override int InitMaxHits{ get{ return 60; } } + public override int InitMinHits => 55; + public override int InitMaxHits => 60; - public override SkillName DefSkill{ get{ return SkillName.Fencing; } } - public override WeaponType DefType{ get{ return WeaponType.Piercing; } } - public override WeaponAnimation DefAnimation{ get{ return WeaponAnimation.Pierce1H; } } + public override SkillName DefSkill => SkillName.Fencing; + public override WeaponType DefType => WeaponType.Piercing; + public override WeaponAnimation DefAnimation => WeaponAnimation.Pierce1H; [Constructible] public Sai() : base( 0x27AF ) @@ -56,4 +56,4 @@ namespace Server.Items int version = reader.ReadInt(); } } -} \ No newline at end of file +} diff --git a/Scripts/Items/Weapons/SE Weapons/Tekagi.cs b/Scripts/Items/Weapons/SE Weapons/Tekagi.cs index 217327446..0cbb46478 100644 --- a/Scripts/Items/Weapons/SE Weapons/Tekagi.cs +++ b/Scripts/Items/Weapons/SE Weapons/Tekagi.cs @@ -7,29 +7,29 @@ namespace Server.Items [FlippableAttribute( 0x27Ab, 0x27F6 )] public class Tekagi : BaseKnife { - public override WeaponAbility PrimaryAbility{ get{ return WeaponAbility.DualWield; } } - public override WeaponAbility SecondaryAbility{ get{ return WeaponAbility.TalonStrike; } } + public override WeaponAbility PrimaryAbility => WeaponAbility.DualWield; + public override WeaponAbility SecondaryAbility => WeaponAbility.TalonStrike; - public override int AosStrengthReq{ get{ return 10; } } - public override int AosMinDamage{ get{ return 10; } } - public override int AosMaxDamage{ get{ return 12; } } - public override int AosSpeed{ get{ return 53; } } - public override float MlSpeed{ get{ return 2.00f; } } + public override int AosStrengthReq => 10; + public override int AosMinDamage => 10; + public override int AosMaxDamage => 12; + public override int AosSpeed => 53; + public override float MlSpeed => 2.00f; - public override int OldStrengthReq{ get{ return 10; } } - public override int OldMinDamage{ get{ return 10; } } - public override int OldMaxDamage{ get{ return 12; } } - public override int OldSpeed{ get{ return 53; } } + public override int OldStrengthReq => 10; + public override int OldMinDamage => 10; + public override int OldMaxDamage => 12; + public override int OldSpeed => 53; - public override int DefHitSound{ get{ return 0x238; } } - public override int DefMissSound{ get{ return 0x232; } } + public override int DefHitSound => 0x238; + public override int DefMissSound => 0x232; - public override int InitMinHits{ get{ return 35; } } - public override int InitMaxHits{ get{ return 60; } } + public override int InitMinHits => 35; + public override int InitMaxHits => 60; - public override SkillName DefSkill{ get{ return SkillName.Fencing; } } - public override WeaponType DefType{ get{ return WeaponType.Piercing; } } - public override WeaponAnimation DefAnimation{ get{ return WeaponAnimation.Pierce1H; } } + public override SkillName DefSkill => SkillName.Fencing; + public override WeaponType DefType => WeaponType.Piercing; + public override WeaponAnimation DefAnimation => WeaponAnimation.Pierce1H; [Constructible] public Tekagi() : base( 0x27AB ) @@ -56,4 +56,4 @@ namespace Server.Items int version = reader.ReadInt(); } } -} \ No newline at end of file +} diff --git a/Scripts/Items/Weapons/SE Weapons/Tessen.cs b/Scripts/Items/Weapons/SE Weapons/Tessen.cs index 00ab7dcc1..ba0fcce03 100644 --- a/Scripts/Items/Weapons/SE Weapons/Tessen.cs +++ b/Scripts/Items/Weapons/SE Weapons/Tessen.cs @@ -7,27 +7,27 @@ namespace Server.Items [FlippableAttribute( 0x27A3, 0x27EE )] public class Tessen : BaseBashing { - public override WeaponAbility PrimaryAbility{ get{ return WeaponAbility.Feint; } } - public override WeaponAbility SecondaryAbility{ get{ return WeaponAbility.Block; } } + public override WeaponAbility PrimaryAbility => WeaponAbility.Feint; + public override WeaponAbility SecondaryAbility => WeaponAbility.Block; - public override int AosStrengthReq{ get{ return 10; } } - public override int AosMinDamage{ get{ return 10; } } - public override int AosMaxDamage{ get{ return 12; } } - public override int AosSpeed{ get{ return 50; } } - public override float MlSpeed{ get{ return 2.00f; } } + public override int AosStrengthReq => 10; + public override int AosMinDamage => 10; + public override int AosMaxDamage => 12; + public override int AosSpeed => 50; + public override float MlSpeed => 2.00f; - public override int OldStrengthReq{ get{ return 10; } } - public override int OldMinDamage{ get{ return 10; } } - public override int OldMaxDamage{ get{ return 12; } } - public override int OldSpeed{ get{ return 50; } } + public override int OldStrengthReq => 10; + public override int OldMinDamage => 10; + public override int OldMaxDamage => 12; + public override int OldSpeed => 50; - public override int DefHitSound{ get{ return 0x232; } } - public override int DefMissSound{ get{ return 0x238; } } + public override int DefHitSound => 0x232; + public override int DefMissSound => 0x238; - public override int InitMinHits{ get{ return 55; } } - public override int InitMaxHits{ get{ return 60; } } + public override int InitMinHits => 55; + public override int InitMaxHits => 60; - public override WeaponAnimation DefAnimation{ get{ return WeaponAnimation.Bash2H; } } + public override WeaponAnimation DefAnimation => WeaponAnimation.Bash2H; [Constructible] public Tessen() : base( 0x27A3 ) @@ -54,4 +54,4 @@ namespace Server.Items int version = reader.ReadInt(); } } -} \ No newline at end of file +} diff --git a/Scripts/Items/Weapons/SE Weapons/Tetsubo.cs b/Scripts/Items/Weapons/SE Weapons/Tetsubo.cs index e6c951a25..006896138 100644 --- a/Scripts/Items/Weapons/SE Weapons/Tetsubo.cs +++ b/Scripts/Items/Weapons/SE Weapons/Tetsubo.cs @@ -7,27 +7,27 @@ namespace Server.Items [FlippableAttribute( 0x27A6, 0x27F1 )] public class Tetsubo : BaseBashing { - public override WeaponAbility PrimaryAbility{ get{ return WeaponAbility.FrenziedWhirlwind; } } - public override WeaponAbility SecondaryAbility{ get{ return WeaponAbility.CrushingBlow; } } + public override WeaponAbility PrimaryAbility => WeaponAbility.FrenziedWhirlwind; + public override WeaponAbility SecondaryAbility => WeaponAbility.CrushingBlow; - public override int AosStrengthReq{ get{ return 35; } } - public override int AosMinDamage{ get{ return 12; } } - public override int AosMaxDamage{ get{ return 14; } } - public override int AosSpeed{ get{ return 45; } } - public override float MlSpeed{ get{ return 2.50f; } } + public override int AosStrengthReq => 35; + public override int AosMinDamage => 12; + public override int AosMaxDamage => 14; + public override int AosSpeed => 45; + public override float MlSpeed => 2.50f; - public override int OldStrengthReq{ get{ return 35; } } - public override int OldMinDamage{ get{ return 12; } } - public override int OldMaxDamage{ get{ return 14; } } - public override int OldSpeed{ get{ return 45; } } + public override int OldStrengthReq => 35; + public override int OldMinDamage => 12; + public override int OldMaxDamage => 14; + public override int OldSpeed => 45; - public override int DefHitSound{ get{ return 0x233; } } - public override int DefMissSound{ get{ return 0x238; } } + public override int DefHitSound => 0x233; + public override int DefMissSound => 0x238; - public override int InitMinHits{ get{ return 60; } } - public override int InitMaxHits{ get{ return 65; } } + public override int InitMinHits => 60; + public override int InitMaxHits => 65; - public override WeaponAnimation DefAnimation{ get{ return WeaponAnimation.Bash2H; } } + public override WeaponAnimation DefAnimation => WeaponAnimation.Bash2H; [Constructible] public Tetsubo() : base( 0x27A6 ) @@ -54,4 +54,4 @@ namespace Server.Items int version = reader.ReadInt(); } } -} \ No newline at end of file +} diff --git a/Scripts/Items/Weapons/SE Weapons/Wakizashi.cs b/Scripts/Items/Weapons/SE Weapons/Wakizashi.cs index 3adaa7ec0..4f11f8739 100644 --- a/Scripts/Items/Weapons/SE Weapons/Wakizashi.cs +++ b/Scripts/Items/Weapons/SE Weapons/Wakizashi.cs @@ -7,25 +7,25 @@ namespace Server.Items [FlippableAttribute( 0x27A4, 0x27EF )] public class Wakizashi : BaseSword { - public override WeaponAbility PrimaryAbility{ get{ return WeaponAbility.FrenziedWhirlwind; } } - public override WeaponAbility SecondaryAbility{ get{ return WeaponAbility.DoubleStrike; } } + public override WeaponAbility PrimaryAbility => WeaponAbility.FrenziedWhirlwind; + public override WeaponAbility SecondaryAbility => WeaponAbility.DoubleStrike; - public override int AosStrengthReq{ get{ return 20; } } - public override int AosMinDamage{ get{ return 11; } } - public override int AosMaxDamage{ get{ return 13; } } - public override int AosSpeed{ get{ return 44; } } - public override float MlSpeed{ get{ return 2.50f; } } + public override int AosStrengthReq => 20; + public override int AosMinDamage => 11; + public override int AosMaxDamage => 13; + public override int AosSpeed => 44; + public override float MlSpeed => 2.50f; - public override int OldStrengthReq{ get{ return 20; } } - public override int OldMinDamage{ get{ return 11; } } - public override int OldMaxDamage{ get{ return 13; } } - public override int OldSpeed{ get{ return 44; } } + public override int OldStrengthReq => 20; + public override int OldMinDamage => 11; + public override int OldMaxDamage => 13; + public override int OldSpeed => 44; - public override int DefHitSound{ get{ return 0x23B; } } - public override int DefMissSound{ get{ return 0x23A; } } + public override int DefHitSound => 0x23B; + public override int DefMissSound => 0x23A; - public override int InitMinHits{ get{ return 45; } } - public override int InitMaxHits{ get{ return 50; } } + public override int InitMinHits => 45; + public override int InitMaxHits => 50; [Constructible] public Wakizashi() : base( 0x27A4 ) @@ -52,4 +52,4 @@ namespace Server.Items int version = reader.ReadInt(); } } -} \ No newline at end of file +} diff --git a/Scripts/Items/Weapons/SE Weapons/Yumi.cs b/Scripts/Items/Weapons/SE Weapons/Yumi.cs index f859e08b3..1b6fbf990 100644 --- a/Scripts/Items/Weapons/SE Weapons/Yumi.cs +++ b/Scripts/Items/Weapons/SE Weapons/Yumi.cs @@ -7,30 +7,30 @@ namespace Server.Items [FlippableAttribute( 0x27A5, 0x27F0 )] public class Yumi : BaseRanged { - public override int EffectID{ get{ return 0xF42; } } - public override Type AmmoType{ get{ return typeof( Arrow ); } } - public override Item Ammo{ get{ return new Arrow(); } } + public override int EffectID => 0xF42; + public override Type AmmoType => typeof( Arrow ); + public override Item Ammo => new Arrow(); - public override WeaponAbility PrimaryAbility{ get{ return WeaponAbility.ArmorPierce; } } - public override WeaponAbility SecondaryAbility{ get{ return WeaponAbility.DoubleShot; } } + public override WeaponAbility PrimaryAbility => WeaponAbility.ArmorPierce; + public override WeaponAbility SecondaryAbility => WeaponAbility.DoubleShot; - public override int AosStrengthReq{ get{ return 35; } } - public override int AosMinDamage{ get{ return Core.ML ? 16 : 18; } } - public override int AosMaxDamage{ get{ return 20; } } - public override int AosSpeed{ get{ return 25; } } - public override float MlSpeed{ get{ return 4.5f; } } + public override int AosStrengthReq => 35; + public override int AosMinDamage => Core.ML ? 16 : 18; + public override int AosMaxDamage => 20; + public override int AosSpeed => 25; + public override float MlSpeed => 4.5f; - public override int OldStrengthReq{ get{ return 35; } } - public override int OldMinDamage{ get{ return 18; } } - public override int OldMaxDamage{ get{ return 20; } } - public override int OldSpeed{ get{ return 25; } } + public override int OldStrengthReq => 35; + public override int OldMinDamage => 18; + public override int OldMaxDamage => 20; + public override int OldSpeed => 25; - public override int DefMaxRange{ get{ return 10; } } + public override int DefMaxRange => 10; - public override int InitMinHits{ get{ return 55; } } - public override int InitMaxHits{ get{ return 60; } } + public override int InitMinHits => 55; + public override int InitMaxHits => 60; - public override WeaponAnimation DefAnimation{ get{ return WeaponAnimation.ShootBow; } } + public override WeaponAnimation DefAnimation => WeaponAnimation.ShootBow; [Constructible] public Yumi() : base( 0x27A5 ) @@ -60,4 +60,4 @@ namespace Server.Items Weight = 6.0; } } -} \ No newline at end of file +} diff --git a/Scripts/Items/Weapons/SpearsAndForks/BaseSpear.cs b/Scripts/Items/Weapons/SpearsAndForks/BaseSpear.cs index e4487040e..3c8d28eb6 100644 --- a/Scripts/Items/Weapons/SpearsAndForks/BaseSpear.cs +++ b/Scripts/Items/Weapons/SpearsAndForks/BaseSpear.cs @@ -6,12 +6,12 @@ namespace Server.Items { public abstract class BaseSpear : BaseMeleeWeapon { - public override int DefHitSound{ get{ return 0x23C; } } - public override int DefMissSound{ get{ return 0x238; } } + public override int DefHitSound => 0x23C; + public override int DefMissSound => 0x238; - public override SkillName DefSkill{ get{ return SkillName.Fencing; } } - public override WeaponType DefType{ get{ return WeaponType.Piercing; } } - public override WeaponAnimation DefAnimation{ get{ return WeaponAnimation.Pierce2H; } } + public override SkillName DefSkill => SkillName.Fencing; + public override WeaponType DefType => WeaponType.Piercing; + public override WeaponAnimation DefAnimation => WeaponAnimation.Pierce2H; public BaseSpear( int itemID ) : base( itemID ) { @@ -57,4 +57,4 @@ namespace Server.Items } } } -} \ No newline at end of file +} diff --git a/Scripts/Items/Weapons/SpearsAndForks/BladedStaff.cs b/Scripts/Items/Weapons/SpearsAndForks/BladedStaff.cs index a7fd591cc..8ad11b92b 100644 --- a/Scripts/Items/Weapons/SpearsAndForks/BladedStaff.cs +++ b/Scripts/Items/Weapons/SpearsAndForks/BladedStaff.cs @@ -7,24 +7,24 @@ namespace Server.Items [FlippableAttribute( 0x26BD, 0x26C7 )] public class BladedStaff : BaseSpear { - public override WeaponAbility PrimaryAbility{ get{ return WeaponAbility.ArmorIgnore; } } - public override WeaponAbility SecondaryAbility{ get{ return WeaponAbility.Dismount; } } + public override WeaponAbility PrimaryAbility => WeaponAbility.ArmorIgnore; + public override WeaponAbility SecondaryAbility => WeaponAbility.Dismount; - public override int AosStrengthReq{ get{ return 40; } } - public override int AosMinDamage{ get{ return 14; } } - public override int AosMaxDamage{ get{ return 16; } } - public override int AosSpeed{ get{ return 37; } } - public override float MlSpeed{ get{ return 3.00f; } } + public override int AosStrengthReq => 40; + public override int AosMinDamage => 14; + public override int AosMaxDamage => 16; + public override int AosSpeed => 37; + public override float MlSpeed => 3.00f; - public override int OldStrengthReq{ get{ return 40; } } - public override int OldMinDamage{ get{ return 14; } } - public override int OldMaxDamage{ get{ return 16; } } - public override int OldSpeed{ get{ return 37; } } + public override int OldStrengthReq => 40; + public override int OldMinDamage => 14; + public override int OldMaxDamage => 16; + public override int OldSpeed => 37; - public override int InitMinHits{ get{ return 21; } } - public override int InitMaxHits{ get{ return 110; } } + public override int InitMinHits => 21; + public override int InitMaxHits => 110; - public override SkillName DefSkill{ get{ return SkillName.Swords; } } + public override SkillName DefSkill => SkillName.Swords; [Constructible] public BladedStaff() : base( 0x26BD ) @@ -50,4 +50,4 @@ namespace Server.Items int version = reader.ReadInt(); } } -} \ No newline at end of file +} diff --git a/Scripts/Items/Weapons/SpearsAndForks/DoubleBladedStaff.cs b/Scripts/Items/Weapons/SpearsAndForks/DoubleBladedStaff.cs index a702a7d23..ac8856e0e 100644 --- a/Scripts/Items/Weapons/SpearsAndForks/DoubleBladedStaff.cs +++ b/Scripts/Items/Weapons/SpearsAndForks/DoubleBladedStaff.cs @@ -7,22 +7,22 @@ namespace Server.Items [FlippableAttribute( 0x26BF, 0x26C9 )] public class DoubleBladedStaff : BaseSpear { - public override WeaponAbility PrimaryAbility{ get{ return WeaponAbility.DoubleStrike; } } - public override WeaponAbility SecondaryAbility{ get{ return WeaponAbility.InfectiousStrike; } } + public override WeaponAbility PrimaryAbility => WeaponAbility.DoubleStrike; + public override WeaponAbility SecondaryAbility => WeaponAbility.InfectiousStrike; - public override int AosStrengthReq{ get{ return 50; } } - public override int AosMinDamage{ get{ return 12; } } - public override int AosMaxDamage{ get{ return 13; } } - public override int AosSpeed{ get{ return 49; } } - public override float MlSpeed{ get{ return 2.25f; } } + public override int AosStrengthReq => 50; + public override int AosMinDamage => 12; + public override int AosMaxDamage => 13; + public override int AosSpeed => 49; + public override float MlSpeed => 2.25f; - public override int OldStrengthReq{ get{ return 50; } } - public override int OldMinDamage{ get{ return 12; } } - public override int OldMaxDamage{ get{ return 13; } } - public override int OldSpeed{ get{ return 49; } } + public override int OldStrengthReq => 50; + public override int OldMinDamage => 12; + public override int OldMaxDamage => 13; + public override int OldSpeed => 49; - public override int InitMinHits{ get{ return 31; } } - public override int InitMaxHits{ get{ return 80; } } + public override int InitMinHits => 31; + public override int InitMaxHits => 80; [Constructible] public DoubleBladedStaff() : base( 0x26BF ) @@ -48,4 +48,4 @@ namespace Server.Items int version = reader.ReadInt(); } } -} \ No newline at end of file +} diff --git a/Scripts/Items/Weapons/SpearsAndForks/Pike.cs b/Scripts/Items/Weapons/SpearsAndForks/Pike.cs index 057c09aa0..146110530 100644 --- a/Scripts/Items/Weapons/SpearsAndForks/Pike.cs +++ b/Scripts/Items/Weapons/SpearsAndForks/Pike.cs @@ -7,22 +7,22 @@ namespace Server.Items [FlippableAttribute( 0x26BE, 0x26C8 )] public class Pike : BaseSpear { - public override WeaponAbility PrimaryAbility{ get{ return WeaponAbility.ParalyzingBlow; } } - public override WeaponAbility SecondaryAbility{ get{ return WeaponAbility.InfectiousStrike; } } + public override WeaponAbility PrimaryAbility => WeaponAbility.ParalyzingBlow; + public override WeaponAbility SecondaryAbility => WeaponAbility.InfectiousStrike; - public override int AosStrengthReq{ get{ return 50; } } - public override int AosMinDamage{ get{ return 14; } } - public override int AosMaxDamage{ get{ return 16; } } - public override int AosSpeed{ get{ return 37; } } - public override float MlSpeed{ get{ return 3.00f; } } + public override int AosStrengthReq => 50; + public override int AosMinDamage => 14; + public override int AosMaxDamage => 16; + public override int AosSpeed => 37; + public override float MlSpeed => 3.00f; - public override int OldStrengthReq{ get{ return 50; } } - public override int OldMinDamage{ get{ return 14; } } - public override int OldMaxDamage{ get{ return 16; } } - public override int OldSpeed{ get{ return 37; } } + public override int OldStrengthReq => 50; + public override int OldMinDamage => 14; + public override int OldMaxDamage => 16; + public override int OldSpeed => 37; - public override int InitMinHits{ get{ return 31; } } - public override int InitMaxHits{ get{ return 110; } } + public override int InitMinHits => 31; + public override int InitMaxHits => 110; [Constructible] public Pike() : base( 0x26BE ) @@ -48,4 +48,4 @@ namespace Server.Items int version = reader.ReadInt(); } } -} \ No newline at end of file +} diff --git a/Scripts/Items/Weapons/SpearsAndForks/Pitchfork.cs b/Scripts/Items/Weapons/SpearsAndForks/Pitchfork.cs index 23112296f..47c69504d 100644 --- a/Scripts/Items/Weapons/SpearsAndForks/Pitchfork.cs +++ b/Scripts/Items/Weapons/SpearsAndForks/Pitchfork.cs @@ -7,22 +7,22 @@ namespace Server.Items [FlippableAttribute( 0xE87, 0xE88 )] public class Pitchfork : BaseSpear { - public override WeaponAbility PrimaryAbility{ get{ return WeaponAbility.BleedAttack; } } - public override WeaponAbility SecondaryAbility{ get{ return WeaponAbility.Dismount; } } + public override WeaponAbility PrimaryAbility => WeaponAbility.BleedAttack; + public override WeaponAbility SecondaryAbility => WeaponAbility.Dismount; - public override int AosStrengthReq{ get{ return 55; } } - public override int AosMinDamage{ get{ return 13; } } - public override int AosMaxDamage{ get{ return 14; } } - public override int AosSpeed{ get{ return 43; } } - public override float MlSpeed{ get{ return 2.50f; } } + public override int AosStrengthReq => 55; + public override int AosMinDamage => 13; + public override int AosMaxDamage => 14; + public override int AosSpeed => 43; + public override float MlSpeed => 2.50f; - public override int OldStrengthReq{ get{ return 15; } } - public override int OldMinDamage{ get{ return 4; } } - public override int OldMaxDamage{ get{ return 16; } } - public override int OldSpeed{ get{ return 45; } } + public override int OldStrengthReq => 15; + public override int OldMinDamage => 4; + public override int OldMaxDamage => 16; + public override int OldSpeed => 45; - public override int InitMinHits{ get{ return 31; } } - public override int InitMaxHits{ get{ return 60; } } + public override int InitMinHits => 31; + public override int InitMaxHits => 60; [Constructible] public Pitchfork() : base( 0xE87 ) @@ -51,4 +51,4 @@ namespace Server.Items Weight = 11.0; } } -} \ No newline at end of file +} diff --git a/Scripts/Items/Weapons/SpearsAndForks/ShortSpear.cs b/Scripts/Items/Weapons/SpearsAndForks/ShortSpear.cs index 112f0c12b..0ead3668f 100644 --- a/Scripts/Items/Weapons/SpearsAndForks/ShortSpear.cs +++ b/Scripts/Items/Weapons/SpearsAndForks/ShortSpear.cs @@ -7,24 +7,24 @@ namespace Server.Items [FlippableAttribute( 0x1403, 0x1402 )] public class ShortSpear : BaseSpear { - public override WeaponAbility PrimaryAbility{ get{ return WeaponAbility.ShadowStrike; } } - public override WeaponAbility SecondaryAbility{ get{ return WeaponAbility.MortalStrike; } } + public override WeaponAbility PrimaryAbility => WeaponAbility.ShadowStrike; + public override WeaponAbility SecondaryAbility => WeaponAbility.MortalStrike; - public override int AosStrengthReq{ get{ return 40; } } - public override int AosMinDamage{ get{ return 10; } } - public override int AosMaxDamage{ get{ return 13; } } - public override int AosSpeed{ get{ return 55; } } - public override float MlSpeed{ get{ return 2.00f; } } + public override int AosStrengthReq => 40; + public override int AosMinDamage => 10; + public override int AosMaxDamage => 13; + public override int AosSpeed => 55; + public override float MlSpeed => 2.00f; - public override int OldStrengthReq{ get{ return 15; } } - public override int OldMinDamage{ get{ return 4; } } - public override int OldMaxDamage{ get{ return 32; } } - public override int OldSpeed{ get{ return 50; } } + public override int OldStrengthReq => 15; + public override int OldMinDamage => 4; + public override int OldMaxDamage => 32; + public override int OldSpeed => 50; - public override int InitMinHits{ get{ return 31; } } - public override int InitMaxHits{ get{ return 70; } } + public override int InitMinHits => 31; + public override int InitMaxHits => 70; - public override WeaponAnimation DefAnimation{ get{ return WeaponAnimation.Pierce1H; } } + public override WeaponAnimation DefAnimation => WeaponAnimation.Pierce1H; [Constructible] public ShortSpear() : base( 0x1403 ) @@ -50,4 +50,4 @@ namespace Server.Items int version = reader.ReadInt(); } } -} \ No newline at end of file +} diff --git a/Scripts/Items/Weapons/SpearsAndForks/Spear.cs b/Scripts/Items/Weapons/SpearsAndForks/Spear.cs index 03b4623f8..b4704700b 100644 --- a/Scripts/Items/Weapons/SpearsAndForks/Spear.cs +++ b/Scripts/Items/Weapons/SpearsAndForks/Spear.cs @@ -7,22 +7,22 @@ namespace Server.Items [FlippableAttribute( 0xF62, 0xF63 )] public class Spear : BaseSpear { - public override WeaponAbility PrimaryAbility{ get{ return WeaponAbility.ArmorIgnore; } } - public override WeaponAbility SecondaryAbility{ get{ return WeaponAbility.ParalyzingBlow; } } + public override WeaponAbility PrimaryAbility => WeaponAbility.ArmorIgnore; + public override WeaponAbility SecondaryAbility => WeaponAbility.ParalyzingBlow; - public override int AosStrengthReq{ get{ return 50; } } - public override int AosMinDamage{ get{ return 13; } } - public override int AosMaxDamage{ get{ return 15; } } - public override int AosSpeed{ get{ return 42; } } - public override float MlSpeed{ get{ return 2.75f; } } + public override int AosStrengthReq => 50; + public override int AosMinDamage => 13; + public override int AosMaxDamage => 15; + public override int AosSpeed => 42; + public override float MlSpeed => 2.75f; - public override int OldStrengthReq{ get{ return 30; } } - public override int OldMinDamage{ get{ return 2; } } - public override int OldMaxDamage{ get{ return 36; } } - public override int OldSpeed{ get{ return 46; } } + public override int OldStrengthReq => 30; + public override int OldMinDamage => 2; + public override int OldMaxDamage => 36; + public override int OldSpeed => 46; - public override int InitMinHits{ get{ return 31; } } - public override int InitMaxHits{ get{ return 80; } } + public override int InitMinHits => 31; + public override int InitMaxHits => 80; [Constructible] public Spear() : base( 0xF62 ) @@ -48,4 +48,4 @@ namespace Server.Items int version = reader.ReadInt(); } } -} \ No newline at end of file +} diff --git a/Scripts/Items/Weapons/SpearsAndForks/TribalSpear.cs b/Scripts/Items/Weapons/SpearsAndForks/TribalSpear.cs index db097c7ea..812ef306a 100644 --- a/Scripts/Items/Weapons/SpearsAndForks/TribalSpear.cs +++ b/Scripts/Items/Weapons/SpearsAndForks/TribalSpear.cs @@ -7,24 +7,24 @@ namespace Server.Items [FlippableAttribute( 0xF62, 0xF63 )] public class TribalSpear : BaseSpear { - public override WeaponAbility PrimaryAbility{ get{ return WeaponAbility.ArmorIgnore; } } - public override WeaponAbility SecondaryAbility{ get{ return WeaponAbility.ParalyzingBlow; } } + public override WeaponAbility PrimaryAbility => WeaponAbility.ArmorIgnore; + public override WeaponAbility SecondaryAbility => WeaponAbility.ParalyzingBlow; - public override int AosStrengthReq{ get{ return 50; } } - public override int AosMinDamage{ get{ return 13; } } - public override int AosMaxDamage{ get{ return 15; } } - public override int AosSpeed{ get{ return 42; } } - public override float MlSpeed{ get{ return 2.75f; } } + public override int AosStrengthReq => 50; + public override int AosMinDamage => 13; + public override int AosMaxDamage => 15; + public override int AosSpeed => 42; + public override float MlSpeed => 2.75f; - public override int OldStrengthReq{ get{ return 30; } } - public override int OldMinDamage{ get{ return 2; } } - public override int OldMaxDamage{ get{ return 36; } } - public override int OldSpeed{ get{ return 46; } } + public override int OldStrengthReq => 30; + public override int OldMinDamage => 2; + public override int OldMaxDamage => 36; + public override int OldSpeed => 46; - public override int InitMinHits{ get{ return 31; } } - public override int InitMaxHits{ get{ return 80; } } + public override int InitMinHits => 31; + public override int InitMaxHits => 80; - public override int VirtualDamageBonus{ get{ return 25; } } + public override int VirtualDamageBonus => 25; public override string DefaultName { @@ -56,4 +56,4 @@ namespace Server.Items int version = reader.ReadInt(); } } -} \ No newline at end of file +} diff --git a/Scripts/Items/Weapons/SpearsAndForks/WarFork.cs b/Scripts/Items/Weapons/SpearsAndForks/WarFork.cs index ad845d4a6..3157d93f3 100644 --- a/Scripts/Items/Weapons/SpearsAndForks/WarFork.cs +++ b/Scripts/Items/Weapons/SpearsAndForks/WarFork.cs @@ -7,27 +7,27 @@ namespace Server.Items [FlippableAttribute( 0x1405, 0x1404 )] public class WarFork : BaseSpear { - public override WeaponAbility PrimaryAbility{ get{ return WeaponAbility.BleedAttack; } } - public override WeaponAbility SecondaryAbility{ get{ return WeaponAbility.Disarm; } } + public override WeaponAbility PrimaryAbility => WeaponAbility.BleedAttack; + public override WeaponAbility SecondaryAbility => WeaponAbility.Disarm; - public override int AosStrengthReq{ get{ return 45; } } - public override int AosMinDamage{ get{ return 12; } } - public override int AosMaxDamage{ get{ return 13; } } - public override int AosSpeed{ get{ return 43; } } - public override float MlSpeed{ get{ return 2.50f; } } + public override int AosStrengthReq => 45; + public override int AosMinDamage => 12; + public override int AosMaxDamage => 13; + public override int AosSpeed => 43; + public override float MlSpeed => 2.50f; - public override int OldStrengthReq{ get{ return 35; } } - public override int OldMinDamage{ get{ return 4; } } - public override int OldMaxDamage{ get{ return 32; } } - public override int OldSpeed{ get{ return 45; } } + public override int OldStrengthReq => 35; + public override int OldMinDamage => 4; + public override int OldMaxDamage => 32; + public override int OldSpeed => 45; - public override int DefHitSound{ get{ return 0x236; } } - public override int DefMissSound{ get{ return 0x238; } } + public override int DefHitSound => 0x236; + public override int DefMissSound => 0x238; - public override int InitMinHits{ get{ return 31; } } - public override int InitMaxHits{ get{ return 110; } } + public override int InitMinHits => 31; + public override int InitMaxHits => 110; - public override WeaponAnimation DefAnimation{ get{ return WeaponAnimation.Pierce1H; } } + public override WeaponAnimation DefAnimation => WeaponAnimation.Pierce1H; [Constructible] public WarFork() : base( 0x1405 ) @@ -53,4 +53,4 @@ namespace Server.Items int version = reader.ReadInt(); } } -} \ No newline at end of file +} diff --git a/Scripts/Items/Weapons/Staves/BaseStaff.cs b/Scripts/Items/Weapons/Staves/BaseStaff.cs index 16baca76e..225393708 100644 --- a/Scripts/Items/Weapons/Staves/BaseStaff.cs +++ b/Scripts/Items/Weapons/Staves/BaseStaff.cs @@ -6,12 +6,12 @@ namespace Server.Items { public abstract class BaseStaff : BaseMeleeWeapon { - public override int DefHitSound{ get{ return 0x233; } } - public override int DefMissSound{ get{ return 0x239; } } + public override int DefHitSound => 0x233; + public override int DefMissSound => 0x239; - public override SkillName DefSkill{ get{ return SkillName.Macing; } } - public override WeaponType DefType{ get{ return WeaponType.Staff; } } - public override WeaponAnimation DefAnimation{ get{ return WeaponAnimation.Bash2H; } } + public override SkillName DefSkill => SkillName.Macing; + public override WeaponType DefType => WeaponType.Staff; + public override WeaponAnimation DefAnimation => WeaponAnimation.Bash2H; public BaseStaff( int itemID ) : base( itemID ) { @@ -42,4 +42,4 @@ namespace Server.Items defender.Stam -= Utility.Random( 3, 3 ); // 3-5 points of stamina loss } } -} \ No newline at end of file +} diff --git a/Scripts/Items/Weapons/Staves/BlackStaff.cs b/Scripts/Items/Weapons/Staves/BlackStaff.cs index a1eff33cd..f6db6dd41 100644 --- a/Scripts/Items/Weapons/Staves/BlackStaff.cs +++ b/Scripts/Items/Weapons/Staves/BlackStaff.cs @@ -7,22 +7,22 @@ namespace Server.Items [FlippableAttribute( 0xDF1, 0xDF0 )] public class BlackStaff : BaseStaff { - public override WeaponAbility PrimaryAbility{ get{ return WeaponAbility.WhirlwindAttack; } } - public override WeaponAbility SecondaryAbility{ get{ return WeaponAbility.ParalyzingBlow; } } + public override WeaponAbility PrimaryAbility => WeaponAbility.WhirlwindAttack; + public override WeaponAbility SecondaryAbility => WeaponAbility.ParalyzingBlow; - public override int AosStrengthReq{ get{ return 35; } } - public override int AosMinDamage{ get{ return 13; } } - public override int AosMaxDamage{ get{ return 16; } } - public override int AosSpeed{ get{ return 39; } } - public override float MlSpeed{ get{ return 2.75f; } } + public override int AosStrengthReq => 35; + public override int AosMinDamage => 13; + public override int AosMaxDamage => 16; + public override int AosSpeed => 39; + public override float MlSpeed => 2.75f; - public override int OldStrengthReq{ get{ return 35; } } - public override int OldMinDamage{ get{ return 8; } } - public override int OldMaxDamage{ get{ return 33; } } - public override int OldSpeed{ get{ return 35; } } + public override int OldStrengthReq => 35; + public override int OldMinDamage => 8; + public override int OldMaxDamage => 33; + public override int OldSpeed => 35; - public override int InitMinHits{ get{ return 31; } } - public override int InitMaxHits{ get{ return 70; } } + public override int InitMinHits => 31; + public override int InitMaxHits => 70; [Constructible] public BlackStaff() : base( 0xDF0 ) @@ -48,4 +48,4 @@ namespace Server.Items int version = reader.ReadInt(); } } -} \ No newline at end of file +} diff --git a/Scripts/Items/Weapons/Staves/GlacialStaff.cs b/Scripts/Items/Weapons/Staves/GlacialStaff.cs index 33f394b43..c81b7e784 100644 --- a/Scripts/Items/Weapons/Staves/GlacialStaff.cs +++ b/Scripts/Items/Weapons/Staves/GlacialStaff.cs @@ -7,7 +7,7 @@ namespace Server.Items public class GlacialStaff : BlackStaff { //TODO: Pre-AoS stuff - public override int LabelNumber{ get{ return 1017413; } } // Glacial Staff + public override int LabelNumber => 1017413; // Glacial Staff [Constructible] public GlacialStaff() diff --git a/Scripts/Items/Weapons/Staves/GnarledStaff.cs b/Scripts/Items/Weapons/Staves/GnarledStaff.cs index cb696c39f..422847f74 100644 --- a/Scripts/Items/Weapons/Staves/GnarledStaff.cs +++ b/Scripts/Items/Weapons/Staves/GnarledStaff.cs @@ -7,22 +7,22 @@ namespace Server.Items [FlippableAttribute( 0x13F8, 0x13F9 )] public class GnarledStaff : BaseStaff { - public override WeaponAbility PrimaryAbility{ get{ return WeaponAbility.ConcussionBlow; } } - public override WeaponAbility SecondaryAbility{ get{ return WeaponAbility.ParalyzingBlow; } } + public override WeaponAbility PrimaryAbility => WeaponAbility.ConcussionBlow; + public override WeaponAbility SecondaryAbility => WeaponAbility.ParalyzingBlow; - public override int AosStrengthReq{ get{ return 20; } } - public override int AosMinDamage{ get{ return 15; } } - public override int AosMaxDamage{ get{ return 17; } } - public override int AosSpeed{ get{ return 33; } } - public override float MlSpeed{ get{ return 3.25f; } } + public override int AosStrengthReq => 20; + public override int AosMinDamage => 15; + public override int AosMaxDamage => 17; + public override int AosSpeed => 33; + public override float MlSpeed => 3.25f; - public override int OldStrengthReq{ get{ return 20; } } - public override int OldMinDamage{ get{ return 10; } } - public override int OldMaxDamage{ get{ return 30; } } - public override int OldSpeed{ get{ return 33; } } + public override int OldStrengthReq => 20; + public override int OldMinDamage => 10; + public override int OldMaxDamage => 30; + public override int OldSpeed => 33; - public override int InitMinHits{ get{ return 31; } } - public override int InitMaxHits{ get{ return 50; } } + public override int InitMinHits => 31; + public override int InitMaxHits => 50; [Constructible] public GnarledStaff() : base( 0x13F8 ) @@ -48,4 +48,4 @@ namespace Server.Items int version = reader.ReadInt(); } } -} \ No newline at end of file +} diff --git a/Scripts/Items/Weapons/Staves/QuarterStaff.cs b/Scripts/Items/Weapons/Staves/QuarterStaff.cs index d7915f9c0..ccaccdef8 100644 --- a/Scripts/Items/Weapons/Staves/QuarterStaff.cs +++ b/Scripts/Items/Weapons/Staves/QuarterStaff.cs @@ -7,22 +7,22 @@ namespace Server.Items [FlippableAttribute( 0xE89, 0xE8a )] public class QuarterStaff : BaseStaff { - public override WeaponAbility PrimaryAbility{ get{ return WeaponAbility.DoubleStrike; } } - public override WeaponAbility SecondaryAbility{ get{ return WeaponAbility.ConcussionBlow; } } + public override WeaponAbility PrimaryAbility => WeaponAbility.DoubleStrike; + public override WeaponAbility SecondaryAbility => WeaponAbility.ConcussionBlow; - public override int AosStrengthReq{ get{ return 30; } } - public override int AosMinDamage{ get{ return 11; } } - public override int AosMaxDamage{ get{ return 14; } } - public override int AosSpeed{ get{ return 48; } } - public override float MlSpeed{ get{ return 2.25f; } } + public override int AosStrengthReq => 30; + public override int AosMinDamage => 11; + public override int AosMaxDamage => 14; + public override int AosSpeed => 48; + public override float MlSpeed => 2.25f; - public override int OldStrengthReq{ get{ return 30; } } - public override int OldMinDamage{ get{ return 8; } } - public override int OldMaxDamage{ get{ return 28; } } - public override int OldSpeed{ get{ return 48; } } + public override int OldStrengthReq => 30; + public override int OldMinDamage => 8; + public override int OldMaxDamage => 28; + public override int OldSpeed => 48; - public override int InitMinHits{ get{ return 31; } } - public override int InitMaxHits{ get{ return 60; } } + public override int InitMinHits => 31; + public override int InitMaxHits => 60; [Constructible] public QuarterStaff() : base( 0xE89 ) @@ -48,4 +48,4 @@ namespace Server.Items int version = reader.ReadInt(); } } -} \ No newline at end of file +} diff --git a/Scripts/Items/Weapons/Staves/ShepherdsCrook.cs b/Scripts/Items/Weapons/Staves/ShepherdsCrook.cs index 7fd5f592d..fa6bb0124 100644 --- a/Scripts/Items/Weapons/Staves/ShepherdsCrook.cs +++ b/Scripts/Items/Weapons/Staves/ShepherdsCrook.cs @@ -10,22 +10,22 @@ namespace Server.Items [FlippableAttribute( 0xE81, 0xE82 )] public class ShepherdsCrook : BaseStaff { - public override WeaponAbility PrimaryAbility{ get{ return WeaponAbility.CrushingBlow; } } - public override WeaponAbility SecondaryAbility{ get{ return WeaponAbility.Disarm; } } + public override WeaponAbility PrimaryAbility => WeaponAbility.CrushingBlow; + public override WeaponAbility SecondaryAbility => WeaponAbility.Disarm; - public override int AosStrengthReq{ get{ return 20; } } - public override int AosMinDamage{ get{ return 13; } } - public override int AosMaxDamage{ get{ return 15; } } - public override int AosSpeed{ get{ return 40; } } - public override float MlSpeed{ get{ return 2.75f; } } + public override int AosStrengthReq => 20; + public override int AosMinDamage => 13; + public override int AosMaxDamage => 15; + public override int AosSpeed => 40; + public override float MlSpeed => 2.75f; - public override int OldStrengthReq{ get{ return 10; } } - public override int OldMinDamage{ get{ return 3; } } - public override int OldMaxDamage{ get{ return 12; } } - public override int OldSpeed{ get{ return 30; } } + public override int OldStrengthReq => 10; + public override int OldMinDamage => 3; + public override int OldMaxDamage => 12; + public override int OldSpeed => 30; - public override int InitMinHits{ get{ return 31; } } - public override int InitMaxHits{ get{ return 50; } } + public override int InitMinHits => 31; + public override int InitMaxHits => 50; [Constructible] public ShepherdsCrook() : base( 0xE81 ) @@ -78,7 +78,7 @@ namespace Server.Items { bc.PrivateOverheadMessage( MessageType.Regular, 0x3B2, 502467, from.NetState ); // That animal looks tame already. } - else + else { from.SendLocalizedMessage( 502475 ); // Click where you wish the animal to go. from.Target = new InternalTarget( bc ); @@ -100,7 +100,7 @@ namespace Server.Items typeof( StrongMongbat ), typeof( Imp ), typeof( Scorpion ), typeof( GiantSpider ), typeof( Snake ), typeof( LavaLizard ), typeof( Drake ), typeof( Dragon ), typeof( Kirin ), typeof( Unicorn ), typeof( GiantRat ), typeof( Slime ), - typeof( DireWolf ), typeof( HellHound ), typeof( DeathwatchBeetle ), + typeof( DireWolf ), typeof( HellHound ), typeof( DeathwatchBeetle ), typeof( LesserHiryu ), typeof( Hiryu ) }; diff --git a/Scripts/Items/Weapons/Swords/AdventurersMachete.cs b/Scripts/Items/Weapons/Swords/AdventurersMachete.cs index 3ff725cea..323a1a7c2 100644 --- a/Scripts/Items/Weapons/Swords/AdventurersMachete.cs +++ b/Scripts/Items/Weapons/Swords/AdventurersMachete.cs @@ -5,7 +5,7 @@ namespace Server.Items { public class AdventurersMachete : ElvenMachete { - public override int LabelNumber{ get{ return 1073533; } } // adventurer's machete + public override int LabelNumber => 1073533; // adventurer's machete [Constructible] public AdventurersMachete() diff --git a/Scripts/Items/Weapons/Swords/BaseSword.cs b/Scripts/Items/Weapons/Swords/BaseSword.cs index aee97ecc8..5513c739d 100644 --- a/Scripts/Items/Weapons/Swords/BaseSword.cs +++ b/Scripts/Items/Weapons/Swords/BaseSword.cs @@ -7,9 +7,9 @@ namespace Server.Items { public abstract class BaseSword : BaseMeleeWeapon { - public override SkillName DefSkill{ get{ return SkillName.Swords; } } - public override WeaponType DefType{ get{ return WeaponType.Slashing; } } - public override WeaponAnimation DefAnimation{ get{ return WeaponAnimation.Slash1H; } } + public override SkillName DefSkill => SkillName.Swords; + public override WeaponType DefType => WeaponType.Slashing; + public override WeaponAnimation DefAnimation => WeaponAnimation.Slash1H; public BaseSword( int itemID ) : base( itemID ) { @@ -53,4 +53,4 @@ namespace Server.Items } } } -} \ No newline at end of file +} diff --git a/Scripts/Items/Weapons/Swords/BoneHarvester.cs b/Scripts/Items/Weapons/Swords/BoneHarvester.cs index 9312d6c1b..4c3c82e3e 100644 --- a/Scripts/Items/Weapons/Swords/BoneHarvester.cs +++ b/Scripts/Items/Weapons/Swords/BoneHarvester.cs @@ -7,25 +7,25 @@ namespace Server.Items [FlippableAttribute( 0x26BB, 0x26C5 )] public class BoneHarvester : BaseSword { - public override WeaponAbility PrimaryAbility{ get{ return WeaponAbility.ParalyzingBlow; } } - public override WeaponAbility SecondaryAbility{ get{ return WeaponAbility.MortalStrike; } } + public override WeaponAbility PrimaryAbility => WeaponAbility.ParalyzingBlow; + public override WeaponAbility SecondaryAbility => WeaponAbility.MortalStrike; - public override int AosStrengthReq{ get{ return 25; } } - public override int AosMinDamage{ get{ return 13; } } - public override int AosMaxDamage{ get{ return 15; } } - public override int AosSpeed{ get{ return 36; } } - public override float MlSpeed{ get{ return 3.00f; } } + public override int AosStrengthReq => 25; + public override int AosMinDamage => 13; + public override int AosMaxDamage => 15; + public override int AosSpeed => 36; + public override float MlSpeed => 3.00f; - public override int OldStrengthReq{ get{ return 25; } } - public override int OldMinDamage{ get{ return 13; } } - public override int OldMaxDamage{ get{ return 15; } } - public override int OldSpeed{ get{ return 36; } } + public override int OldStrengthReq => 25; + public override int OldMinDamage => 13; + public override int OldMaxDamage => 15; + public override int OldSpeed => 36; - public override int DefHitSound{ get{ return 0x23B; } } - public override int DefMissSound{ get{ return 0x23A; } } + public override int DefHitSound => 0x23B; + public override int DefMissSound => 0x23A; - public override int InitMinHits{ get{ return 31; } } - public override int InitMaxHits{ get{ return 70; } } + public override int InitMinHits => 31; + public override int InitMaxHits => 70; [Constructible] public BoneHarvester() : base( 0x26BB ) @@ -51,4 +51,4 @@ namespace Server.Items int version = reader.ReadInt(); } } -} \ No newline at end of file +} diff --git a/Scripts/Items/Weapons/Swords/BoneMachete.cs b/Scripts/Items/Weapons/Swords/BoneMachete.cs index 2f77acba0..757781db0 100644 --- a/Scripts/Items/Weapons/Swords/BoneMachete.cs +++ b/Scripts/Items/Weapons/Swords/BoneMachete.cs @@ -6,17 +6,17 @@ namespace Server.Items { public class BoneMachete : ElvenMachete, ITicket { - public override WeaponAbility PrimaryAbility { get { return null; } } - public override WeaponAbility SecondaryAbility { get { return null; } } + public override WeaponAbility PrimaryAbility => null; + public override WeaponAbility SecondaryAbility => null; - public override int PhysicalResistance { get { return 1; } } - public override int FireResistance { get { return 1; } } - public override int ColdResistance { get { return 1; } } - public override int PoisonResistance { get { return 1; } } - public override int EnergyResistance { get { return 1; } } + public override int PhysicalResistance => 1; + public override int FireResistance => 1; + public override int ColdResistance => 1; + public override int PoisonResistance => 1; + public override int EnergyResistance => 1; - public override int InitMinHits { get { return 5; } } - public override int InitMaxHits { get { return 5; } } + public override int InitMinHits => 5; + public override int InitMaxHits => 5; [Constructible] public BoneMachete() diff --git a/Scripts/Items/Weapons/Swords/Broadsword.cs b/Scripts/Items/Weapons/Swords/Broadsword.cs index b63a95b9c..5fcb5bbc6 100644 --- a/Scripts/Items/Weapons/Swords/Broadsword.cs +++ b/Scripts/Items/Weapons/Swords/Broadsword.cs @@ -7,25 +7,25 @@ namespace Server.Items [FlippableAttribute( 0xF5E, 0xF5F )] public class Broadsword : BaseSword { - public override WeaponAbility PrimaryAbility{ get{ return WeaponAbility.CrushingBlow; } } - public override WeaponAbility SecondaryAbility{ get{ return WeaponAbility.ArmorIgnore; } } + public override WeaponAbility PrimaryAbility => WeaponAbility.CrushingBlow; + public override WeaponAbility SecondaryAbility => WeaponAbility.ArmorIgnore; - public override int AosStrengthReq{ get{ return 30; } } - public override int AosMinDamage{ get{ return 14; } } - public override int AosMaxDamage{ get{ return 15; } } - public override int AosSpeed{ get{ return 33; } } - public override float MlSpeed{ get{ return 3.25f; } } + public override int AosStrengthReq => 30; + public override int AosMinDamage => 14; + public override int AosMaxDamage => 15; + public override int AosSpeed => 33; + public override float MlSpeed => 3.25f; - public override int OldStrengthReq{ get{ return 25; } } - public override int OldMinDamage{ get{ return 5; } } - public override int OldMaxDamage{ get{ return 29; } } - public override int OldSpeed{ get{ return 45; } } + public override int OldStrengthReq => 25; + public override int OldMinDamage => 5; + public override int OldMaxDamage => 29; + public override int OldSpeed => 45; - public override int DefHitSound{ get{ return 0x237; } } - public override int DefMissSound{ get{ return 0x23A; } } + public override int DefHitSound => 0x237; + public override int DefMissSound => 0x23A; - public override int InitMinHits{ get{ return 31; } } - public override int InitMaxHits{ get{ return 100; } } + public override int InitMinHits => 31; + public override int InitMaxHits => 100; [Constructible] public Broadsword() : base( 0xF5E ) @@ -51,4 +51,4 @@ namespace Server.Items int version = reader.ReadInt(); } } -} \ No newline at end of file +} diff --git a/Scripts/Items/Weapons/Swords/ChargedAssassinSpike.cs b/Scripts/Items/Weapons/Swords/ChargedAssassinSpike.cs index 0e5fcb884..dbf824953 100644 --- a/Scripts/Items/Weapons/Swords/ChargedAssassinSpike.cs +++ b/Scripts/Items/Weapons/Swords/ChargedAssassinSpike.cs @@ -5,7 +5,7 @@ namespace Server.Items { public class ChargedAssassinSpike : AssassinSpike { - public override int LabelNumber{ get{ return 1073518; } } // charged assassin spike + public override int LabelNumber => 1073518; // charged assassin spike [Constructible] public ChargedAssassinSpike() diff --git a/Scripts/Items/Weapons/Swords/CorruptedRuneBlade.cs b/Scripts/Items/Weapons/Swords/CorruptedRuneBlade.cs index fd861d8ed..cf8a48927 100644 --- a/Scripts/Items/Weapons/Swords/CorruptedRuneBlade.cs +++ b/Scripts/Items/Weapons/Swords/CorruptedRuneBlade.cs @@ -5,7 +5,7 @@ namespace Server.Items { public class CorruptedRuneBlade : RuneBlade { - public override int LabelNumber{ get{ return 1073540; } } // Corrupted Rune Blade + public override int LabelNumber => 1073540; // Corrupted Rune Blade [Constructible] public CorruptedRuneBlade() diff --git a/Scripts/Items/Weapons/Swords/CrescentBlade.cs b/Scripts/Items/Weapons/Swords/CrescentBlade.cs index d29c0456f..13645b9dd 100644 --- a/Scripts/Items/Weapons/Swords/CrescentBlade.cs +++ b/Scripts/Items/Weapons/Swords/CrescentBlade.cs @@ -7,25 +7,25 @@ namespace Server.Items [FlippableAttribute( 0x26C1, 0x26CB )] public class CrescentBlade : BaseSword { - public override WeaponAbility PrimaryAbility{ get{ return WeaponAbility.DoubleStrike; } } - public override WeaponAbility SecondaryAbility{ get{ return WeaponAbility.MortalStrike; } } + public override WeaponAbility PrimaryAbility => WeaponAbility.DoubleStrike; + public override WeaponAbility SecondaryAbility => WeaponAbility.MortalStrike; - public override int AosStrengthReq{ get{ return 55; } } - public override int AosMinDamage{ get{ return 11; } } - public override int AosMaxDamage{ get{ return 14; } } - public override int AosSpeed{ get{ return 47; } } - public override float MlSpeed{ get{ return 2.50f; } } + public override int AosStrengthReq => 55; + public override int AosMinDamage => 11; + public override int AosMaxDamage => 14; + public override int AosSpeed => 47; + public override float MlSpeed => 2.50f; - public override int OldStrengthReq{ get{ return 55; } } - public override int OldMinDamage{ get{ return 11; } } - public override int OldMaxDamage{ get{ return 14; } } - public override int OldSpeed{ get{ return 47; } } + public override int OldStrengthReq => 55; + public override int OldMinDamage => 11; + public override int OldMaxDamage => 14; + public override int OldSpeed => 47; - public override int DefHitSound{ get{ return 0x23B; } } - public override int DefMissSound{ get{ return 0x23A; } } + public override int DefHitSound => 0x23B; + public override int DefMissSound => 0x23A; - public override int InitMinHits{ get{ return 51; } } - public override int InitMaxHits{ get{ return 80; } } + public override int InitMinHits => 51; + public override int InitMaxHits => 80; [Constructible] public CrescentBlade() : base( 0x26C1 ) @@ -51,4 +51,4 @@ namespace Server.Items int version = reader.ReadInt(); } } -} \ No newline at end of file +} diff --git a/Scripts/Items/Weapons/Swords/Cutlass.cs b/Scripts/Items/Weapons/Swords/Cutlass.cs index 6b61cc06d..2c75de75e 100644 --- a/Scripts/Items/Weapons/Swords/Cutlass.cs +++ b/Scripts/Items/Weapons/Swords/Cutlass.cs @@ -7,25 +7,25 @@ namespace Server.Items [FlippableAttribute( 0x1441, 0x1440 )] public class Cutlass : BaseSword { - public override WeaponAbility PrimaryAbility{ get{ return WeaponAbility.BleedAttack; } } - public override WeaponAbility SecondaryAbility{ get{ return WeaponAbility.ShadowStrike; } } + public override WeaponAbility PrimaryAbility => WeaponAbility.BleedAttack; + public override WeaponAbility SecondaryAbility => WeaponAbility.ShadowStrike; - public override int AosStrengthReq{ get{ return 25; } } - public override int AosMinDamage{ get{ return 11; } } - public override int AosMaxDamage{ get{ return 13; } } - public override int AosSpeed{ get{ return 44; } } - public override float MlSpeed{ get{ return 2.50f; } } + public override int AosStrengthReq => 25; + public override int AosMinDamage => 11; + public override int AosMaxDamage => 13; + public override int AosSpeed => 44; + public override float MlSpeed => 2.50f; - public override int OldStrengthReq{ get{ return 10; } } - public override int OldMinDamage{ get{ return 6; } } - public override int OldMaxDamage{ get{ return 28; } } - public override int OldSpeed{ get{ return 45; } } + public override int OldStrengthReq => 10; + public override int OldMinDamage => 6; + public override int OldMaxDamage => 28; + public override int OldSpeed => 45; - public override int DefHitSound{ get{ return 0x23B; } } - public override int DefMissSound{ get{ return 0x23A; } } + public override int DefHitSound => 0x23B; + public override int DefMissSound => 0x23A; - public override int InitMinHits{ get{ return 31; } } - public override int InitMaxHits{ get{ return 70; } } + public override int InitMinHits => 31; + public override int InitMaxHits => 70; [Constructible] public Cutlass() : base( 0x1441 ) @@ -51,4 +51,4 @@ namespace Server.Items int version = reader.ReadInt(); } } -} \ No newline at end of file +} diff --git a/Scripts/Items/Weapons/Swords/DarkglowScimitar.cs b/Scripts/Items/Weapons/Swords/DarkglowScimitar.cs index 1f42251fd..f04fb41fe 100644 --- a/Scripts/Items/Weapons/Swords/DarkglowScimitar.cs +++ b/Scripts/Items/Weapons/Swords/DarkglowScimitar.cs @@ -5,7 +5,7 @@ namespace Server.Items { public class DarkglowScimitar : RadiantScimitar { - public override int LabelNumber{ get{ return 1073542; } } // darkglow scimitar + public override int LabelNumber => 1073542; // darkglow scimitar [Constructible] public DarkglowScimitar() diff --git a/Scripts/Items/Weapons/Swords/DiseasedMachete.cs b/Scripts/Items/Weapons/Swords/DiseasedMachete.cs index 6ef17908e..f91a92bc7 100644 --- a/Scripts/Items/Weapons/Swords/DiseasedMachete.cs +++ b/Scripts/Items/Weapons/Swords/DiseasedMachete.cs @@ -5,7 +5,7 @@ namespace Server.Items { public class DiseasedMachete : ElvenMachete { - public override int LabelNumber{ get{ return 1073536; } } // Diseased Machete + public override int LabelNumber => 1073536; // Diseased Machete [Constructible] public DiseasedMachete() diff --git a/Scripts/Items/Weapons/Swords/FierySpellblade.cs b/Scripts/Items/Weapons/Swords/FierySpellblade.cs index 3232c2383..efe72cacd 100644 --- a/Scripts/Items/Weapons/Swords/FierySpellblade.cs +++ b/Scripts/Items/Weapons/Swords/FierySpellblade.cs @@ -5,7 +5,7 @@ namespace Server.Items { public class FierySpellblade : ElvenSpellblade { - public override int LabelNumber{ get{ return 1073515; } } // fiery spellblade + public override int LabelNumber => 1073515; // fiery spellblade [Constructible] public FierySpellblade() diff --git a/Scripts/Items/Weapons/Swords/IcyScimitar.cs b/Scripts/Items/Weapons/Swords/IcyScimitar.cs index d6fbddffb..4aab23777 100644 --- a/Scripts/Items/Weapons/Swords/IcyScimitar.cs +++ b/Scripts/Items/Weapons/Swords/IcyScimitar.cs @@ -5,7 +5,7 @@ namespace Server.Items { public class IcyScimitar : RadiantScimitar { - public override int LabelNumber{ get{ return 1073543; } } // icy scimitar + public override int LabelNumber => 1073543; // icy scimitar [Constructible] public IcyScimitar() diff --git a/Scripts/Items/Weapons/Swords/IcySpellblade.cs b/Scripts/Items/Weapons/Swords/IcySpellblade.cs index e060adcb4..5d561a430 100644 --- a/Scripts/Items/Weapons/Swords/IcySpellblade.cs +++ b/Scripts/Items/Weapons/Swords/IcySpellblade.cs @@ -5,7 +5,7 @@ namespace Server.Items { public class IcySpellblade : ElvenSpellblade { - public override int LabelNumber{ get{ return 1073514; } } // icy spellblade + public override int LabelNumber => 1073514; // icy spellblade [Constructible] public IcySpellblade() diff --git a/Scripts/Items/Weapons/Swords/Katana.cs b/Scripts/Items/Weapons/Swords/Katana.cs index 3e6d871ed..f0163783a 100644 --- a/Scripts/Items/Weapons/Swords/Katana.cs +++ b/Scripts/Items/Weapons/Swords/Katana.cs @@ -7,25 +7,25 @@ namespace Server.Items [FlippableAttribute( 0x13FF, 0x13FE )] public class Katana : BaseSword { - public override WeaponAbility PrimaryAbility{ get{ return WeaponAbility.DoubleStrike; } } - public override WeaponAbility SecondaryAbility{ get{ return WeaponAbility.ArmorIgnore; } } + public override WeaponAbility PrimaryAbility => WeaponAbility.DoubleStrike; + public override WeaponAbility SecondaryAbility => WeaponAbility.ArmorIgnore; - public override int AosStrengthReq{ get{ return 25; } } - public override int AosMinDamage{ get{ return 11; } } - public override int AosMaxDamage{ get{ return 13; } } - public override int AosSpeed{ get{ return 46; } } - public override float MlSpeed{ get{ return 2.50f; } } + public override int AosStrengthReq => 25; + public override int AosMinDamage => 11; + public override int AosMaxDamage => 13; + public override int AosSpeed => 46; + public override float MlSpeed => 2.50f; - public override int OldStrengthReq{ get{ return 10; } } - public override int OldMinDamage{ get{ return 5; } } - public override int OldMaxDamage{ get{ return 26; } } - public override int OldSpeed{ get{ return 58; } } + public override int OldStrengthReq => 10; + public override int OldMinDamage => 5; + public override int OldMaxDamage => 26; + public override int OldSpeed => 58; - public override int DefHitSound{ get{ return 0x23B; } } - public override int DefMissSound{ get{ return 0x23A; } } + public override int DefHitSound => 0x23B; + public override int DefMissSound => 0x23A; - public override int InitMinHits{ get{ return 31; } } - public override int InitMaxHits{ get{ return 90; } } + public override int InitMinHits => 31; + public override int InitMaxHits => 90; [Constructible] public Katana() : base( 0x13FF ) @@ -51,4 +51,4 @@ namespace Server.Items int version = reader.ReadInt(); } } -} \ No newline at end of file +} diff --git a/Scripts/Items/Weapons/Swords/KnightsWarCleaver.cs b/Scripts/Items/Weapons/Swords/KnightsWarCleaver.cs index 4c6f45efa..18e172807 100644 --- a/Scripts/Items/Weapons/Swords/KnightsWarCleaver.cs +++ b/Scripts/Items/Weapons/Swords/KnightsWarCleaver.cs @@ -5,7 +5,7 @@ namespace Server.Items { public class KnightsWarCleaver : WarCleaver { - public override int LabelNumber{ get{ return 1073525; } } // knight's war cleaver + public override int LabelNumber => 1073525; // knight's war cleaver [Constructible] public KnightsWarCleaver() diff --git a/Scripts/Items/Weapons/Swords/Kryss.cs b/Scripts/Items/Weapons/Swords/Kryss.cs index a99ed68de..0c2e94140 100644 --- a/Scripts/Items/Weapons/Swords/Kryss.cs +++ b/Scripts/Items/Weapons/Swords/Kryss.cs @@ -7,29 +7,29 @@ namespace Server.Items [FlippableAttribute( 0x1401, 0x1400 )] public class Kryss : BaseSword { - public override WeaponAbility PrimaryAbility{ get{ return WeaponAbility.ArmorIgnore; } } - public override WeaponAbility SecondaryAbility{ get{ return WeaponAbility.InfectiousStrike; } } + public override WeaponAbility PrimaryAbility => WeaponAbility.ArmorIgnore; + public override WeaponAbility SecondaryAbility => WeaponAbility.InfectiousStrike; - public override int AosStrengthReq{ get{ return 10; } } - public override int AosMinDamage{ get{ return 10; } } - public override int AosMaxDamage{ get{ return 12; } } - public override int AosSpeed{ get{ return 53; } } - public override float MlSpeed{ get{ return 2.00f; } } + public override int AosStrengthReq => 10; + public override int AosMinDamage => 10; + public override int AosMaxDamage => 12; + public override int AosSpeed => 53; + public override float MlSpeed => 2.00f; - public override int OldStrengthReq{ get{ return 10; } } - public override int OldMinDamage{ get{ return 3; } } - public override int OldMaxDamage{ get{ return 28; } } - public override int OldSpeed{ get{ return 53; } } + public override int OldStrengthReq => 10; + public override int OldMinDamage => 3; + public override int OldMaxDamage => 28; + public override int OldSpeed => 53; - public override int DefHitSound{ get{ return 0x23C; } } - public override int DefMissSound{ get{ return 0x238; } } + public override int DefHitSound => 0x23C; + public override int DefMissSound => 0x238; - public override int InitMinHits{ get{ return 31; } } - public override int InitMaxHits{ get{ return 90; } } + public override int InitMinHits => 31; + public override int InitMaxHits => 90; - public override SkillName DefSkill{ get{ return SkillName.Fencing; } } - public override WeaponType DefType{ get{ return WeaponType.Piercing; } } - public override WeaponAnimation DefAnimation{ get{ return WeaponAnimation.Pierce1H; } } + public override SkillName DefSkill => SkillName.Fencing; + public override WeaponType DefType => WeaponType.Piercing; + public override WeaponAnimation DefAnimation => WeaponAnimation.Pierce1H; [Constructible] public Kryss() : base( 0x1401 ) @@ -58,4 +58,4 @@ namespace Server.Items Weight = 2.0; } } -} \ No newline at end of file +} diff --git a/Scripts/Items/Weapons/Swords/Lance.cs b/Scripts/Items/Weapons/Swords/Lance.cs index 6bae17868..1e2a7eb54 100644 --- a/Scripts/Items/Weapons/Swords/Lance.cs +++ b/Scripts/Items/Weapons/Swords/Lance.cs @@ -7,29 +7,29 @@ namespace Server.Items [FlippableAttribute( 0x26C0, 0x26CA )] public class Lance : BaseSword { - public override WeaponAbility PrimaryAbility{ get{ return WeaponAbility.Dismount; } } - public override WeaponAbility SecondaryAbility{ get{ return WeaponAbility.ConcussionBlow; } } + public override WeaponAbility PrimaryAbility => WeaponAbility.Dismount; + public override WeaponAbility SecondaryAbility => WeaponAbility.ConcussionBlow; - public override int AosStrengthReq{ get{ return 95; } } - public override int AosMinDamage{ get{ return 17; } } - public override int AosMaxDamage{ get{ return 18; } } - public override int AosSpeed{ get{ return 24; } } - public override float MlSpeed{ get{ return 4.50f; } } + public override int AosStrengthReq => 95; + public override int AosMinDamage => 17; + public override int AosMaxDamage => 18; + public override int AosSpeed => 24; + public override float MlSpeed => 4.50f; - public override int OldStrengthReq{ get{ return 95; } } - public override int OldMinDamage{ get{ return 17; } } - public override int OldMaxDamage{ get{ return 18; } } - public override int OldSpeed{ get{ return 24; } } + public override int OldStrengthReq => 95; + public override int OldMinDamage => 17; + public override int OldMaxDamage => 18; + public override int OldSpeed => 24; - public override int DefHitSound{ get{ return 0x23C; } } - public override int DefMissSound{ get{ return 0x238; } } + public override int DefHitSound => 0x23C; + public override int DefMissSound => 0x238; - public override int InitMinHits{ get{ return 31; } } - public override int InitMaxHits{ get{ return 110; } } + public override int InitMinHits => 31; + public override int InitMaxHits => 110; - public override SkillName DefSkill{ get{ return SkillName.Fencing; } } - public override WeaponType DefType{ get{ return WeaponType.Piercing; } } - public override WeaponAnimation DefAnimation{ get{ return WeaponAnimation.Pierce1H; } } + public override SkillName DefSkill => SkillName.Fencing; + public override WeaponType DefType => WeaponType.Piercing; + public override WeaponAnimation DefAnimation => WeaponAnimation.Pierce1H; [Constructible] public Lance() : base( 0x26C0 ) @@ -55,4 +55,4 @@ namespace Server.Items int version = reader.ReadInt(); } } -} \ No newline at end of file +} diff --git a/Scripts/Items/Weapons/Swords/LeafbladeOfEase.cs b/Scripts/Items/Weapons/Swords/LeafbladeOfEase.cs index 9c87518e3..f3091c5e2 100644 --- a/Scripts/Items/Weapons/Swords/LeafbladeOfEase.cs +++ b/Scripts/Items/Weapons/Swords/LeafbladeOfEase.cs @@ -5,7 +5,7 @@ namespace Server.Items { public class LeafbladeOfEase : Leafblade { - public override int LabelNumber{ get{ return 1073524; } } // leafblade of ease + public override int LabelNumber => 1073524; // leafblade of ease [Constructible] public LeafbladeOfEase() diff --git a/Scripts/Items/Weapons/Swords/Longsword.cs b/Scripts/Items/Weapons/Swords/Longsword.cs index 8b87b0564..365893fba 100644 --- a/Scripts/Items/Weapons/Swords/Longsword.cs +++ b/Scripts/Items/Weapons/Swords/Longsword.cs @@ -7,25 +7,25 @@ namespace Server.Items [FlippableAttribute( 0xF61, 0xF60 )] public class Longsword : BaseSword { - public override WeaponAbility PrimaryAbility{ get{ return WeaponAbility.ArmorIgnore; } } - public override WeaponAbility SecondaryAbility{ get{ return WeaponAbility.ConcussionBlow; } } + public override WeaponAbility PrimaryAbility => WeaponAbility.ArmorIgnore; + public override WeaponAbility SecondaryAbility => WeaponAbility.ConcussionBlow; - public override int AosStrengthReq{ get{ return 35; } } - public override int AosMinDamage{ get{ return 15; } } - public override int AosMaxDamage{ get{ return 16; } } - public override int AosSpeed{ get{ return 30; } } - public override float MlSpeed{ get{ return 3.50f; } } + public override int AosStrengthReq => 35; + public override int AosMinDamage => 15; + public override int AosMaxDamage => 16; + public override int AosSpeed => 30; + public override float MlSpeed => 3.50f; - public override int OldStrengthReq{ get{ return 25; } } - public override int OldMinDamage{ get{ return 5; } } - public override int OldMaxDamage{ get{ return 33; } } - public override int OldSpeed{ get{ return 35; } } + public override int OldStrengthReq => 25; + public override int OldMinDamage => 5; + public override int OldMaxDamage => 33; + public override int OldSpeed => 35; - public override int DefHitSound{ get{ return 0x237; } } - public override int DefMissSound{ get{ return 0x23A; } } + public override int DefHitSound => 0x237; + public override int DefMissSound => 0x23A; - public override int InitMinHits{ get{ return 31; } } - public override int InitMaxHits{ get{ return 110; } } + public override int InitMinHits => 31; + public override int InitMaxHits => 110; [Constructible] public Longsword() : base( 0xF61 ) @@ -51,4 +51,4 @@ namespace Server.Items int version = reader.ReadInt(); } } -} \ No newline at end of file +} diff --git a/Scripts/Items/Weapons/Swords/Luckblade.cs b/Scripts/Items/Weapons/Swords/Luckblade.cs index f5876162c..3fbc70f1b 100644 --- a/Scripts/Items/Weapons/Swords/Luckblade.cs +++ b/Scripts/Items/Weapons/Swords/Luckblade.cs @@ -5,7 +5,7 @@ namespace Server.Items { public class Luckblade : Leafblade { - public override int LabelNumber{ get{ return 1073522; } } // luckblade + public override int LabelNumber => 1073522; // luckblade [Constructible] public Luckblade() diff --git a/Scripts/Items/Weapons/Swords/MacheteOfDefense.cs b/Scripts/Items/Weapons/Swords/MacheteOfDefense.cs index 4001f1f44..1d1e6198a 100644 --- a/Scripts/Items/Weapons/Swords/MacheteOfDefense.cs +++ b/Scripts/Items/Weapons/Swords/MacheteOfDefense.cs @@ -5,7 +5,7 @@ namespace Server.Items { public class MacheteOfDefense : ElvenMachete { - public override int LabelNumber{ get{ return 1073535; } } // machete of defense + public override int LabelNumber => 1073535; // machete of defense [Constructible] public MacheteOfDefense() diff --git a/Scripts/Items/Weapons/Swords/MagekillerAssassinSpike.cs b/Scripts/Items/Weapons/Swords/MagekillerAssassinSpike.cs index 4976b2078..6b100bacf 100644 --- a/Scripts/Items/Weapons/Swords/MagekillerAssassinSpike.cs +++ b/Scripts/Items/Weapons/Swords/MagekillerAssassinSpike.cs @@ -5,7 +5,7 @@ namespace Server.Items { public class MagekillerAssassinSpike : AssassinSpike { - public override int LabelNumber{ get{ return 1073519; } } // magekiller assassin spike + public override int LabelNumber => 1073519; // magekiller assassin spike [Constructible] public MagekillerAssassinSpike() diff --git a/Scripts/Items/Weapons/Swords/MagekillerLeafblade.cs b/Scripts/Items/Weapons/Swords/MagekillerLeafblade.cs index 05ade0ab6..d2c079501 100644 --- a/Scripts/Items/Weapons/Swords/MagekillerLeafblade.cs +++ b/Scripts/Items/Weapons/Swords/MagekillerLeafblade.cs @@ -5,7 +5,7 @@ namespace Server.Items { public class MagekillerLeafblade : Leafblade { - public override int LabelNumber{ get{ return 1073523; } } // maagekiller leafblade + public override int LabelNumber => 1073523; // maagekiller leafblade [Constructible] public MagekillerLeafblade() diff --git a/Scripts/Items/Weapons/Swords/MagesRuneBlade.cs b/Scripts/Items/Weapons/Swords/MagesRuneBlade.cs index 35b528993..58c815334 100644 --- a/Scripts/Items/Weapons/Swords/MagesRuneBlade.cs +++ b/Scripts/Items/Weapons/Swords/MagesRuneBlade.cs @@ -5,7 +5,7 @@ namespace Server.Items { public class MagesRuneBlade : RuneBlade { - public override int LabelNumber{ get{ return 1073538; } } // mage's rune blade + public override int LabelNumber => 1073538; // mage's rune blade [Constructible] public MagesRuneBlade() diff --git a/Scripts/Items/Weapons/Swords/OrcishMachete.cs b/Scripts/Items/Weapons/Swords/OrcishMachete.cs index ce5ba1fc3..4dd3b4e0c 100644 --- a/Scripts/Items/Weapons/Swords/OrcishMachete.cs +++ b/Scripts/Items/Weapons/Swords/OrcishMachete.cs @@ -5,7 +5,7 @@ namespace Server.Items { public class OrcishMachete : ElvenMachete { - public override int LabelNumber{ get{ return 1073534; } } // Orcish Machete + public override int LabelNumber => 1073534; // Orcish Machete [Constructible] public OrcishMachete() diff --git a/Scripts/Items/Weapons/Swords/RuneBladeOfKnowledge.cs b/Scripts/Items/Weapons/Swords/RuneBladeOfKnowledge.cs index caab19309..c0cce5beb 100644 --- a/Scripts/Items/Weapons/Swords/RuneBladeOfKnowledge.cs +++ b/Scripts/Items/Weapons/Swords/RuneBladeOfKnowledge.cs @@ -5,7 +5,7 @@ namespace Server.Items { public class RuneBladeOfKnowledge : RuneBlade { - public override int LabelNumber{ get{ return 1073539; } } // rune blade of knowledge + public override int LabelNumber => 1073539; // rune blade of knowledge [Constructible] public RuneBladeOfKnowledge() diff --git a/Scripts/Items/Weapons/Swords/Runesabre.cs b/Scripts/Items/Weapons/Swords/Runesabre.cs index 2b4d65c12..dc69e39d5 100644 --- a/Scripts/Items/Weapons/Swords/Runesabre.cs +++ b/Scripts/Items/Weapons/Swords/Runesabre.cs @@ -5,7 +5,7 @@ namespace Server.Items { public class Runesabre : RuneBlade { - public override int LabelNumber{ get{ return 1073537; } } // runesabre + public override int LabelNumber => 1073537; // runesabre [Constructible] public Runesabre() diff --git a/Scripts/Items/Weapons/Swords/Scimitar.cs b/Scripts/Items/Weapons/Swords/Scimitar.cs index 9098cf270..3633c2f26 100644 --- a/Scripts/Items/Weapons/Swords/Scimitar.cs +++ b/Scripts/Items/Weapons/Swords/Scimitar.cs @@ -7,25 +7,25 @@ namespace Server.Items [FlippableAttribute( 0x13B6, 0x13B5 )] public class Scimitar : BaseSword { - public override WeaponAbility PrimaryAbility{ get{ return WeaponAbility.DoubleStrike; } } - public override WeaponAbility SecondaryAbility{ get{ return WeaponAbility.ParalyzingBlow; } } + public override WeaponAbility PrimaryAbility => WeaponAbility.DoubleStrike; + public override WeaponAbility SecondaryAbility => WeaponAbility.ParalyzingBlow; - public override int AosStrengthReq{ get{ return 25; } } - public override int AosMinDamage{ get{ return 13; } } - public override int AosMaxDamage{ get{ return 15; } } - public override int AosSpeed{ get{ return 37; } } - public override float MlSpeed{ get{ return 3.00f; } } + public override int AosStrengthReq => 25; + public override int AosMinDamage => 13; + public override int AosMaxDamage => 15; + public override int AosSpeed => 37; + public override float MlSpeed => 3.00f; - public override int OldStrengthReq{ get{ return 10; } } - public override int OldMinDamage{ get{ return 4; } } - public override int OldMaxDamage{ get{ return 30; } } - public override int OldSpeed{ get{ return 43; } } + public override int OldStrengthReq => 10; + public override int OldMinDamage => 4; + public override int OldMaxDamage => 30; + public override int OldSpeed => 43; - public override int DefHitSound{ get{ return 0x23B; } } - public override int DefMissSound{ get{ return 0x23A; } } + public override int DefHitSound => 0x23B; + public override int DefMissSound => 0x23A; - public override int InitMinHits{ get{ return 31; } } - public override int InitMaxHits{ get{ return 90; } } + public override int InitMinHits => 31; + public override int InitMaxHits => 90; [Constructible] public Scimitar() : base( 0x13B6 ) @@ -51,4 +51,4 @@ namespace Server.Items int version = reader.ReadInt(); } } -} \ No newline at end of file +} diff --git a/Scripts/Items/Weapons/Swords/SerratedWarCleaver.cs b/Scripts/Items/Weapons/Swords/SerratedWarCleaver.cs index 28b5ba3db..f0ef2ce90 100644 --- a/Scripts/Items/Weapons/Swords/SerratedWarCleaver.cs +++ b/Scripts/Items/Weapons/Swords/SerratedWarCleaver.cs @@ -5,7 +5,7 @@ namespace Server.Items { public class SerratedWarCleaver : WarCleaver { - public override int LabelNumber{ get{ return 1073527; } } // serrated war cleaver + public override int LabelNumber => 1073527; // serrated war cleaver [Constructible] public SerratedWarCleaver() diff --git a/Scripts/Items/Weapons/Swords/SpellbladeOfDefense.cs b/Scripts/Items/Weapons/Swords/SpellbladeOfDefense.cs index 133d2289b..1b92608e1 100644 --- a/Scripts/Items/Weapons/Swords/SpellbladeOfDefense.cs +++ b/Scripts/Items/Weapons/Swords/SpellbladeOfDefense.cs @@ -5,7 +5,7 @@ namespace Server.Items { public class SpellbladeOfDefense : ElvenSpellblade { - public override int LabelNumber{ get{ return 1073516; } } // spellblade of defense + public override int LabelNumber => 1073516; // spellblade of defense [Constructible] public SpellbladeOfDefense() diff --git a/Scripts/Items/Weapons/Swords/ThinLongsword.cs b/Scripts/Items/Weapons/Swords/ThinLongsword.cs index 153b4808b..a951a8648 100644 --- a/Scripts/Items/Weapons/Swords/ThinLongsword.cs +++ b/Scripts/Items/Weapons/Swords/ThinLongsword.cs @@ -7,22 +7,22 @@ namespace Server.Items [FlippableAttribute( 0x13B8, 0x13B7 )] public class ThinLongsword : BaseSword { - public override int AosStrengthReq{ get{ return 35; } } - public override int AosMinDamage{ get{ return 15; } } - public override int AosMaxDamage{ get{ return 16; } } - public override int AosSpeed{ get{ return 30; } } - public override float MlSpeed{ get{ return 3.50f; } } + public override int AosStrengthReq => 35; + public override int AosMinDamage => 15; + public override int AosMaxDamage => 16; + public override int AosSpeed => 30; + public override float MlSpeed => 3.50f; - public override int OldStrengthReq{ get{ return 25; } } - public override int OldMinDamage{ get{ return 5; } } - public override int OldMaxDamage{ get{ return 33; } } - public override int OldSpeed{ get{ return 35; } } + public override int OldStrengthReq => 25; + public override int OldMinDamage => 5; + public override int OldMaxDamage => 33; + public override int OldSpeed => 35; - public override int DefHitSound{ get{ return 0x237; } } - public override int DefMissSound{ get{ return 0x23A; } } + public override int DefHitSound => 0x237; + public override int DefMissSound => 0x23A; - public override int InitMinHits{ get{ return 31; } } - public override int InitMaxHits{ get{ return 110; } } + public override int InitMinHits => 31; + public override int InitMaxHits => 110; [Constructible] public ThinLongsword() : base( 0x13B8 ) @@ -48,4 +48,4 @@ namespace Server.Items int version = reader.ReadInt(); } } -} \ No newline at end of file +} diff --git a/Scripts/Items/Weapons/Swords/TrueAssassinSpike.cs b/Scripts/Items/Weapons/Swords/TrueAssassinSpike.cs index 8828a6aca..092d58f73 100644 --- a/Scripts/Items/Weapons/Swords/TrueAssassinSpike.cs +++ b/Scripts/Items/Weapons/Swords/TrueAssassinSpike.cs @@ -5,7 +5,7 @@ namespace Server.Items { public class TrueAssassinSpike : AssassinSpike { - public override int LabelNumber{ get{ return 1073517; } } // true assassin spike + public override int LabelNumber => 1073517; // true assassin spike [Constructible] public TrueAssassinSpike() diff --git a/Scripts/Items/Weapons/Swords/TrueLeafblade.cs b/Scripts/Items/Weapons/Swords/TrueLeafblade.cs index 4122f1a70..bb6bf7ac4 100644 --- a/Scripts/Items/Weapons/Swords/TrueLeafblade.cs +++ b/Scripts/Items/Weapons/Swords/TrueLeafblade.cs @@ -5,7 +5,7 @@ namespace Server.Items { public class TrueLeafblade : Leafblade { - public override int LabelNumber{ get{ return 1073521; } } // true leafblade + public override int LabelNumber => 1073521; // true leafblade [Constructible] public TrueLeafblade() diff --git a/Scripts/Items/Weapons/Swords/TrueRadiantScimitar.cs b/Scripts/Items/Weapons/Swords/TrueRadiantScimitar.cs index 99d83419c..9a61b114b 100644 --- a/Scripts/Items/Weapons/Swords/TrueRadiantScimitar.cs +++ b/Scripts/Items/Weapons/Swords/TrueRadiantScimitar.cs @@ -5,7 +5,7 @@ namespace Server.Items { public class TrueRadiantScimitar : RadiantScimitar { - public override int LabelNumber{ get{ return 1073541; } } // true radiant scimitar + public override int LabelNumber => 1073541; // true radiant scimitar [Constructible] public TrueRadiantScimitar() diff --git a/Scripts/Items/Weapons/Swords/TrueSpellblade.cs b/Scripts/Items/Weapons/Swords/TrueSpellblade.cs index ed0867971..bf424302a 100644 --- a/Scripts/Items/Weapons/Swords/TrueSpellblade.cs +++ b/Scripts/Items/Weapons/Swords/TrueSpellblade.cs @@ -5,7 +5,7 @@ namespace Server.Items { public class TrueSpellblade : ElvenSpellblade { - public override int LabelNumber{ get{ return 1073513; } } // true spellblade + public override int LabelNumber => 1073513; // true spellblade [Constructible] public TrueSpellblade() diff --git a/Scripts/Items/Weapons/Swords/TrueWarCleaver.cs b/Scripts/Items/Weapons/Swords/TrueWarCleaver.cs index 833900d08..3a91230a5 100644 --- a/Scripts/Items/Weapons/Swords/TrueWarCleaver.cs +++ b/Scripts/Items/Weapons/Swords/TrueWarCleaver.cs @@ -5,7 +5,7 @@ namespace Server.Items { public class TrueWarCleaver : WarCleaver { - public override int LabelNumber{ get{ return 1073528; } } // true war cleaver + public override int LabelNumber => 1073528; // true war cleaver [Constructible] public TrueWarCleaver() diff --git a/Scripts/Items/Weapons/Swords/TwinklingScimitar.cs b/Scripts/Items/Weapons/Swords/TwinklingScimitar.cs index 568a52ef2..5a99fd614 100644 --- a/Scripts/Items/Weapons/Swords/TwinklingScimitar.cs +++ b/Scripts/Items/Weapons/Swords/TwinklingScimitar.cs @@ -5,7 +5,7 @@ namespace Server.Items { public class TwinklingScimitar : RadiantScimitar { - public override int LabelNumber{ get{ return 1073544; } } // twinkling scimitar + public override int LabelNumber => 1073544; // twinkling scimitar [Constructible] public TwinklingScimitar() diff --git a/Scripts/Items/Weapons/Swords/VikingSword.cs b/Scripts/Items/Weapons/Swords/VikingSword.cs index dcfd03770..83102ed29 100644 --- a/Scripts/Items/Weapons/Swords/VikingSword.cs +++ b/Scripts/Items/Weapons/Swords/VikingSword.cs @@ -7,25 +7,25 @@ namespace Server.Items [FlippableAttribute( 0x13B9, 0x13Ba )] public class VikingSword : BaseSword { - public override WeaponAbility PrimaryAbility{ get{ return WeaponAbility.CrushingBlow; } } - public override WeaponAbility SecondaryAbility{ get{ return WeaponAbility.ParalyzingBlow; } } + public override WeaponAbility PrimaryAbility => WeaponAbility.CrushingBlow; + public override WeaponAbility SecondaryAbility => WeaponAbility.ParalyzingBlow; - public override int AosStrengthReq{ get{ return 40; } } - public override int AosMinDamage{ get{ return 15; } } - public override int AosMaxDamage{ get{ return 17; } } - public override int AosSpeed{ get{ return 28; } } - public override float MlSpeed{ get{ return 3.75f; } } + public override int AosStrengthReq => 40; + public override int AosMinDamage => 15; + public override int AosMaxDamage => 17; + public override int AosSpeed => 28; + public override float MlSpeed => 3.75f; - public override int OldStrengthReq{ get{ return 40; } } - public override int OldMinDamage{ get{ return 6; } } - public override int OldMaxDamage{ get{ return 34; } } - public override int OldSpeed{ get{ return 30; } } + public override int OldStrengthReq => 40; + public override int OldMinDamage => 6; + public override int OldMaxDamage => 34; + public override int OldSpeed => 30; - public override int DefHitSound{ get{ return 0x237; } } - public override int DefMissSound{ get{ return 0x23A; } } + public override int DefHitSound => 0x237; + public override int DefMissSound => 0x23A; - public override int InitMinHits{ get{ return 31; } } - public override int InitMaxHits{ get{ return 100; } } + public override int InitMinHits => 31; + public override int InitMaxHits => 100; [Constructible] public VikingSword() : base( 0x13B9 ) @@ -51,4 +51,4 @@ namespace Server.Items int version = reader.ReadInt(); } } -} \ No newline at end of file +} diff --git a/Scripts/Items/Weapons/Swords/WoundingAssassinSpike.cs b/Scripts/Items/Weapons/Swords/WoundingAssassinSpike.cs index a8c209728..af2246f5c 100644 --- a/Scripts/Items/Weapons/Swords/WoundingAssassinSpike.cs +++ b/Scripts/Items/Weapons/Swords/WoundingAssassinSpike.cs @@ -5,7 +5,7 @@ namespace Server.Items { public class WoundingAssassinSpike : AssassinSpike { - public override int LabelNumber{ get{ return 1073520; } } // wounding assassin spike + public override int LabelNumber => 1073520; // wounding assassin spike [Constructible] public WoundingAssassinSpike() diff --git a/Scripts/Items/Weapons/Wooden/AncientWildStaff.cs b/Scripts/Items/Weapons/Wooden/AncientWildStaff.cs index 081d72be7..1a48fd61a 100644 --- a/Scripts/Items/Weapons/Wooden/AncientWildStaff.cs +++ b/Scripts/Items/Weapons/Wooden/AncientWildStaff.cs @@ -5,7 +5,7 @@ namespace Server.Items { public class AncientWildStaff : WildStaff { - public override int LabelNumber{ get{ return 1073550; } } // ancient wild staff + public override int LabelNumber => 1073550; // ancient wild staff [Constructible] public AncientWildStaff() diff --git a/Scripts/Items/Weapons/Wooden/ArcanistsWildStaff.cs b/Scripts/Items/Weapons/Wooden/ArcanistsWildStaff.cs index 9e964729b..e0675fe3b 100644 --- a/Scripts/Items/Weapons/Wooden/ArcanistsWildStaff.cs +++ b/Scripts/Items/Weapons/Wooden/ArcanistsWildStaff.cs @@ -5,7 +5,7 @@ namespace Server.Items { public class ArcanistsWildStaff : WildStaff { - public override int LabelNumber{ get{ return 1073549; } } // arcanist's wild staff + public override int LabelNumber => 1073549; // arcanist's wild staff [Constructible] public ArcanistsWildStaff() diff --git a/Scripts/Items/Weapons/Wooden/HardenedWildStaff.cs b/Scripts/Items/Weapons/Wooden/HardenedWildStaff.cs index ed4dee398..5305e084f 100644 --- a/Scripts/Items/Weapons/Wooden/HardenedWildStaff.cs +++ b/Scripts/Items/Weapons/Wooden/HardenedWildStaff.cs @@ -5,7 +5,7 @@ namespace Server.Items { public class HardenedWildStaff : WildStaff { - public override int LabelNumber{ get{ return 1073552; } } // hardened wild staff + public override int LabelNumber => 1073552; // hardened wild staff [Constructible] public HardenedWildStaff() diff --git a/Scripts/Items/Weapons/Wooden/ThornedWildStaff.cs b/Scripts/Items/Weapons/Wooden/ThornedWildStaff.cs index 5240e3b91..ec135dd69 100644 --- a/Scripts/Items/Weapons/Wooden/ThornedWildStaff.cs +++ b/Scripts/Items/Weapons/Wooden/ThornedWildStaff.cs @@ -5,7 +5,7 @@ namespace Server.Items { public class ThornedWildStaff : WildStaff { - public override int LabelNumber{ get{ return 1073551; } } // thorned wild staff + public override int LabelNumber => 1073551; // thorned wild staff [Constructible] public ThornedWildStaff() diff --git a/Scripts/Misc/AOS.cs b/Scripts/Misc/AOS.cs index 834275fbd..0589377fe 100644 --- a/Scripts/Misc/AOS.cs +++ b/Scripts/Misc/AOS.cs @@ -93,7 +93,7 @@ namespace Server } BaseQuiver quiver = null; - + if ( archer && from != null ) quiver = from.FindItemOnLayer( Layer.Cloak ) as BaseQuiver; @@ -1023,7 +1023,7 @@ namespace Server private static int[] m_Empty = new int[0]; public bool IsEmpty { get { return (m_Names == 0); } } - public Item Owner { get { return m_Owner; } } + public Item Owner => m_Owner; public BaseAttributes( Item owner ) { @@ -1223,4 +1223,4 @@ namespace Server return index; } } -} \ No newline at end of file +} diff --git a/Scripts/Misc/Assistants.cs b/Scripts/Misc/Assistants.cs index fd42f72ce..4b7732f8d 100644 --- a/Scripts/Misc/Assistants.cs +++ b/Scripts/Misc/Assistants.cs @@ -82,7 +82,7 @@ namespace Server.Misc m_DisallowedFeatures &= ~feature; } - public static Features DisallowedFeatures { get { return m_DisallowedFeatures; } } + public static Features DisallowedFeatures => m_DisallowedFeatures; } private static class Negotiator @@ -107,13 +107,12 @@ namespace Server.Misc if (m != null && m.NetState != null && m.NetState.Running) { - Timer t; m.Send(new BeginHandshake()); if (Settings.KickOnFailure) m.Send(new BeginHandshake()); - if (m_Dictionary.TryGetValue(m, out t) && t != null) + if (m_Dictionary.TryGetValue(m, out Timer t) && t != null) t.Stop(); m_Dictionary[m] = t = Timer.DelayCall(Settings.HandshakeTimeout, OnHandshakeTimeout_Callback, m); @@ -128,10 +127,8 @@ namespace Server.Misc if (state == null || state.Mobile == null || !state.Running) return; - Timer t; Mobile m = state.Mobile; - - if (m_Dictionary.TryGetValue(m, out t)) + if (m_Dictionary.TryGetValue( m, out Timer t )) { if (t != null) t.Stop(); @@ -192,4 +189,4 @@ namespace Server.Misc } } } -} \ No newline at end of file +} diff --git a/Scripts/Misc/BuffIcons.cs b/Scripts/Misc/BuffIcons.cs index 6da805726..24fc44106 100644 --- a/Scripts/Misc/BuffIcons.cs +++ b/Scripts/Misc/BuffIcons.cs @@ -8,7 +8,7 @@ namespace Server { public class BuffInfo { - public static bool Enabled { get { return Core.ML; } } + public static bool Enabled => Core.ML; public static void Initialize() { @@ -17,7 +17,7 @@ namespace Server EventSink.ClientVersionReceived += new ClientVersionReceivedHandler( delegate( ClientVersionReceivedArgs args ) { PlayerMobile pm = args.State.Mobile as PlayerMobile; - + if( pm != null ) Timer.DelayCall( TimeSpan.Zero, pm.ResendBuffs ); } ); @@ -26,28 +26,28 @@ namespace Server #region Properties private BuffIcon m_ID; - public BuffIcon ID { get { return m_ID; } } + public BuffIcon ID => m_ID; private int m_TitleCliloc; - public int TitleCliloc { get { return m_TitleCliloc; } } + public int TitleCliloc => m_TitleCliloc; private int m_SecondaryCliloc; - public int SecondaryCliloc { get { return m_SecondaryCliloc; } } + public int SecondaryCliloc => m_SecondaryCliloc; private TimeSpan m_TimeLength; - public TimeSpan TimeLength { get { return m_TimeLength; } } + public TimeSpan TimeLength => m_TimeLength; private DateTime m_TimeStart; - public DateTime TimeStart { get { return m_TimeStart; } } + public DateTime TimeStart => m_TimeStart; private Timer m_Timer; - public Timer Timer { get { return m_Timer; } } + public Timer Timer => m_Timer; private bool m_RetainThroughDeath; - public bool RetainThroughDeath { get { return m_RetainThroughDeath; } } + public bool RetainThroughDeath => m_RetainThroughDeath; private TextDefinition m_Args; - public TextDefinition Args { get { return m_Args; } } + public TextDefinition Args => m_Args; #endregion @@ -228,7 +228,7 @@ namespace Server SpellPlague, SpellTrigger, NetherBolt, - Fly + Fly } public sealed class AddBuffPacket : Packet diff --git a/Scripts/Misc/Emitter.cs b/Scripts/Misc/Emitter.cs index 69639a575..6b824f3ec 100644 --- a/Scripts/Misc/Emitter.cs +++ b/Scripts/Misc/Emitter.cs @@ -127,9 +127,7 @@ namespace Server public LocalBuilder AcquireTemp( Type localType ) { - Queue list; - - if ( !m_Temps.TryGetValue( localType, out list ) ) + if (!m_Temps.TryGetValue( localType, out Queue list )) m_Temps[localType] = list = new Queue(); if ( list.Count > 0 ) @@ -140,9 +138,7 @@ namespace Server public void ReleaseTemp( LocalBuilder local ) { - Queue list; - - if ( !m_Temps.TryGetValue( local.LocalType, out list ) ) + if (!m_Temps.TryGetValue( local.LocalType, out Queue list )) m_Temps[local.LocalType] = list = new Queue(); list.Enqueue( local ); @@ -504,25 +500,25 @@ namespace Server if ( compareTo == null ) { /* This gets a little tricky... - * + * * There's a scenario where we might be trying to use CompareTo on an interface * which, while it doesn't explicitly implement CompareTo itself, is said to * extend IComparable indirectly. The implementation is implicitly passed off * to implementers... - * + * * interface ISomeInterface : IComparable * { * void SomeMethod(); * } - * + * * class SomeClass : ISomeInterface * { * void SomeMethod() { ... } * int CompareTo( object other ) { ... } * } - * + * * In this case, calling ISomeInterface.GetMethod( "CompareTo" ) will return null. - * + * * Bleh. */ @@ -555,11 +551,11 @@ namespace Server if ( !active.IsValueType ) { /* This object is a reference type, so we have to make it behave - * + * * null.CompareTo( null ) = 0 * real.CompareTo( null ) = -1 * null.CompareTo( real ) = +1 - * + * */ LocalBuilder aValue = AcquireTemp( active ); @@ -724,4 +720,4 @@ namespace Server m_Generator.Emit( OpCodes.Box, argumentType ); } } -} \ No newline at end of file +} diff --git a/Scripts/Misc/Gifts/Winter2004/Mistletoe.cs b/Scripts/Misc/Gifts/Winter2004/Mistletoe.cs index e103f8182..50a6318ae 100644 --- a/Scripts/Misc/Gifts/Winter2004/Mistletoe.cs +++ b/Scripts/Misc/Gifts/Winter2004/Mistletoe.cs @@ -119,7 +119,7 @@ namespace Server.Items return false; } } - else + else { return false; } @@ -170,7 +170,7 @@ namespace Server.Items [Flippable( 0x14F0, 0x14EF )] public class MistletoeDeed : Item { - public override int LabelNumber{ get{ return 1070882; } } // Mistletoe Deed + public override int LabelNumber => 1070882; // Mistletoe Deed [Constructible] public MistletoeDeed() : this( 0 ) @@ -339,4 +339,4 @@ namespace Server.Items } } } -} \ No newline at end of file +} diff --git a/Scripts/Misc/Gifts/Winter2004/PileOfGlacialSnow.cs b/Scripts/Misc/Gifts/Winter2004/PileOfGlacialSnow.cs index b37d2c137..e27eec335 100644 --- a/Scripts/Misc/Gifts/Winter2004/PileOfGlacialSnow.cs +++ b/Scripts/Misc/Gifts/Winter2004/PileOfGlacialSnow.cs @@ -15,7 +15,7 @@ namespace Server.Items LootType = LootType.Blessed; } - public override int LabelNumber{ get{ return 1070874; } } // a Pile of Glacial Snow + public override int LabelNumber => 1070874; // a Pile of Glacial Snow public PileOfGlacialSnow( Serial serial ) : base( serial ) { @@ -148,4 +148,4 @@ namespace Server.Items } } } -} \ No newline at end of file +} diff --git a/Scripts/Misc/Gifts/Winter2004/SnowPile.cs b/Scripts/Misc/Gifts/Winter2004/SnowPile.cs index 3d1c6f1c8..116396dcf 100644 --- a/Scripts/Misc/Gifts/Winter2004/SnowPile.cs +++ b/Scripts/Misc/Gifts/Winter2004/SnowPile.cs @@ -15,7 +15,7 @@ namespace Server.Items LootType = LootType.Blessed; } - public override int LabelNumber{ get{ return 1005578; } } // a pile of snow + public override int LabelNumber => 1005578; // a pile of snow public SnowPile( Serial serial ) : base( serial ) { @@ -134,4 +134,4 @@ namespace Server.Items } } } -} \ No newline at end of file +} diff --git a/Scripts/Misc/Gifts/Winter2004/Winter2004.cs b/Scripts/Misc/Gifts/Winter2004/Winter2004.cs index a771b73aa..e7c139127 100644 --- a/Scripts/Misc/Gifts/Winter2004/Winter2004.cs +++ b/Scripts/Misc/Gifts/Winter2004/Winter2004.cs @@ -11,8 +11,8 @@ namespace Server.Misc GiftGiving.Register( new WinterGiftGiver2004() ); } - public override DateTime Start{ get{ return new DateTime( 2004, 12, 24 ); } } - public override DateTime Finish{ get{ return new DateTime( 2005, 1, 1 ); } } + public override DateTime Start => new DateTime( 2004, 12, 24 ); + public override DateTime Finish => new DateTime( 2005, 1, 1 ); public override void GiveGift( Mobile mob ) { @@ -42,4 +42,4 @@ namespace Server.Misc } } } -} \ No newline at end of file +} diff --git a/Scripts/Misc/Guild.cs b/Scripts/Misc/Guild.cs index a18163505..842b19262 100644 --- a/Scripts/Misc/Guild.cs +++ b/Scripts/Misc/Guild.cs @@ -55,7 +55,7 @@ namespace Server.Guilds public RankDefinition( TextDefinition name, int rank, RankFlags flags ) { - m_Name = name; + m_Name = name; m_Rank = rank; m_Flags = flags; } @@ -90,7 +90,7 @@ namespace Server.Guilds private Guild m_Leader; private List m_Members; private List m_PendingMembers; - + public string Name { get{ return m_Name; } @@ -117,7 +117,7 @@ namespace Server.Guilds get { CheckLeader(); - return m_Leader; + return m_Leader; } set { @@ -222,7 +222,7 @@ namespace Server.Guilds { m_PendingMembers.Remove( g ); } - + if( m_Members.Contains( g ) ) //Sanity, just incase someone with a custom script adds a character to BOTH arrays { m_Members.Remove( g ); @@ -262,10 +262,7 @@ namespace Server.Guilds for( int i = 0; i < m_Members.Count; i++ ) m_Members[i].Alliance = null; - - AllianceInfo aInfo = null; - - m_Alliances.TryGetValue( m_Name.ToLower(), out aInfo ); + m_Alliances.TryGetValue( m_Name.ToLower(), out AllianceInfo aInfo ); if( aInfo == this ) m_Alliances.Remove( m_Name.ToLower() ); @@ -432,7 +429,7 @@ namespace Server.Guilds public int Kills { - get{ return m_Kills; } + get{ return m_Kills; } set{ m_Kills = value; } } public int MaxKills @@ -455,7 +452,7 @@ namespace Server.Guilds } public DateTime WarBeginning { - get{ return m_WarBeginning; } + get{ return m_WarBeginning; } set{ m_WarBeginning = value; } } public bool WarRequester @@ -568,7 +565,7 @@ namespace Server.Guilds Priority = TimerPriority.FiveSeconds; } - protected override void OnTick() + protected override void OnTick() { foreach( Guild g in Guild.List.Values ) g.CheckExpiredWars(); @@ -680,7 +677,7 @@ namespace Server.Guilds PlayerMobile pm = args.Mobile as PlayerMobile; if( !NewGuildSystem || pm == null ) return; - + if( pm.Guild == null ) pm.SendGump( new CreateGuildGump( pm ) ); else @@ -729,7 +726,7 @@ namespace Server.Guilds if( value != null ) { - + if( value.Leader == this ) m_AllianceInfo = value; else @@ -799,14 +796,14 @@ namespace Server.Guilds return false; } } - + public static Guild GetAllianceLeader( Guild g ) { AllianceInfo alliance = g.Alliance; - + if ( alliance != null && alliance.Leader != null && alliance.IsMember( g ) ) return alliance.Leader; - + return g; } @@ -820,7 +817,7 @@ namespace Server.Guilds } public List AcceptedWars { - get{ return m_AcceptedWars; } + get{ return m_AcceptedWars; } } @@ -863,7 +860,7 @@ namespace Server.Guilds { AllianceInfo myAlliance = this.Alliance; bool inAlliance = ( myAlliance != null && myAlliance.IsMember( this ) ); - + AllianceInfo otherAlliance = ((g != null) ? g.Alliance : null); bool otherInAlliance = ( otherAlliance != null && otherAlliance.IsMember( this ) ); @@ -937,12 +934,12 @@ namespace Server.Guilds Guild victimGuild = GetAllianceLeader( victim.Guild as Guild ); Guild killerGuild = GetAllianceLeader( killer.Guild as Guild ); - + WarDeclaration war = killerGuild.FindActiveWar( victimGuild ); if( war == null ) return; - + war.Kills++; if ( war.Opponent == victimGuild ) @@ -1049,7 +1046,7 @@ namespace Server.Guilds m_Members[i].Delta( MobileDelta.Noto ); } } - + public void InvalidateWarNotoriety() { Guild g = GetAllianceLeader( this ); @@ -1058,14 +1055,14 @@ namespace Server.Guilds g.Alliance.InvalidateMemberNotoriety(); else g.InvalidateMemberNotoriety(); - + if ( g.AcceptedWars == null ) return; foreach ( WarDeclaration warDec in g.AcceptedWars ) { Guild opponent = warDec.Opponent; - + if ( opponent.Alliance != null ) opponent.Alliance.InvalidateMemberNotoriety(); else @@ -1340,7 +1337,7 @@ namespace Server.Guilds m_Members = reader.ReadStrongMobileList(); m_Candidates = reader.ReadStrongMobileList(); - m_Accepted = reader.ReadStrongMobileList(); + m_Accepted = reader.ReadStrongMobileList(); m_Guildstone = reader.ReadItem(); m_Teleporter = reader.ReadItem(); @@ -1388,7 +1385,7 @@ namespace Server.Guilds alliance = this.Alliance; //CheckLeader could possibly change the value of this.Alliance - if( alliance != null && !alliance.IsMember( this ) && !alliance.IsPendingMember( this ) ) //This block is there to fix a bug in the code in an older version. + if( alliance != null && !alliance.IsMember( this ) && !alliance.IsPendingMember( this ) ) //This block is there to fix a bug in the code in an older version. this.Alliance = null; //Will call Alliance.RemoveGuild which will set it null & perform all the pertient checks as far as alliacne disbanding } @@ -1413,7 +1410,7 @@ namespace Server.Guilds if( m is PlayerMobile ) ((PlayerMobile)m).GuildRank = RankDefinition.Lowest; - + Guild guild = m.Guild as Guild; if ( guild != null ) @@ -1430,9 +1427,9 @@ namespace Server.Guilds if ( m_Members.Contains( m ) ) { m_Members.Remove( m ); - + Guild guild = m.Guild as Guild; - + m.Guild = null; if( m is PlayerMobile ) @@ -1451,10 +1448,10 @@ namespace Server.Guilds if ( m_Members.Count == 0 ) Disband(); - + if ( guild != null ) guild.InvalidateWarNotoriety(); - + m.Delta( MobileDelta.Noto ); } } @@ -1624,20 +1621,18 @@ namespace Server.Guilds { if ( m_Leader != null && !m_Leader.Deleted && m_Leader.Guild == this ) m = m_Leader; - else + else m = memb; } if ( m == null ) continue; - int v; - - if( !votes.TryGetValue( m, out v ) ) + if( !votes.TryGetValue( m, out int v ) ) votes[m] = 1; else votes[m] = v + 1; - + votingMembers++; } diff --git a/Scripts/Misc/HardwareInfo.cs b/Scripts/Misc/HardwareInfo.cs index f538bb480..3421071a4 100644 --- a/Scripts/Misc/HardwareInfo.cs +++ b/Scripts/Misc/HardwareInfo.cs @@ -98,7 +98,7 @@ namespace Server public string Unknown{ get{ return m_Unknown; } } [CommandProperty( AccessLevel.GameMaster )] - public DateTime TimeReceived { get { return m_TimeReceived; } } + public DateTime TimeReceived => m_TimeReceived; public static void Initialize() { @@ -186,4 +186,4 @@ namespace Server acct.HardwareInfo = info; } } -} \ No newline at end of file +} diff --git a/Scripts/Misc/InhumanSpeech.cs b/Scripts/Misc/InhumanSpeech.cs index 48ad49cc6..abf90864c 100644 --- a/Scripts/Misc/InhumanSpeech.cs +++ b/Scripts/Misc/InhumanSpeech.cs @@ -371,7 +371,7 @@ namespace Server.Misc } int syllableCount; - + if ( 30 > Utility.Random( 100 ) ) syllableCount = Utility.Random( 1, 5 ); else @@ -433,8 +433,7 @@ namespace Server.Misc for ( int i = 0; i < split.Length; ++i ) { - string keyword; - m_KeywordHash.TryGetValue( split[i], out keyword ); + m_KeywordHash.TryGetValue( split[i], out string keyword ); if ( keyword != null ) keywordsFound.Add( keyword ); @@ -592,4 +591,4 @@ namespace Server.Misc { } } -} \ No newline at end of file +} diff --git a/Scripts/Misc/MondainsLegacy.cs b/Scripts/Misc/MondainsLegacy.cs index 52be80cd6..d34283ef1 100644 --- a/Scripts/Misc/MondainsLegacy.cs +++ b/Scripts/Misc/MondainsLegacy.cs @@ -7,7 +7,7 @@ namespace Server { public static class MondainsLegacy { - public static Type[] Artifacts { get { return m_Artifacts; } } + public static Type[] Artifacts => m_Artifacts; private static Type[] m_Artifacts = new Type[] { @@ -83,4 +83,4 @@ namespace Server || region.IsPartOf( "Labyrinth" ); } } -} \ No newline at end of file +} diff --git a/Scripts/Misc/NameList.cs b/Scripts/Misc/NameList.cs index 289fea085..4a7f37c5a 100644 --- a/Scripts/Misc/NameList.cs +++ b/Scripts/Misc/NameList.cs @@ -43,8 +43,7 @@ namespace Server public static NameList GetNameList( string type ) { - NameList n = null; - m_Table.TryGetValue( type, out n ); + m_Table.TryGetValue( type, out NameList n ); return n; } diff --git a/Scripts/Misc/NameVerification.cs b/Scripts/Misc/NameVerification.cs index 6682d8e80..6c5a3e45e 100644 --- a/Scripts/Misc/NameVerification.cs +++ b/Scripts/Misc/NameVerification.cs @@ -112,8 +112,8 @@ namespace Server.Misc return true; } - public static string[] StartDisallowed { get { return m_StartDisallowed; } } - public static string[] Disallowed { get { return m_Disallowed; } } + public static string[] StartDisallowed => m_StartDisallowed; + public static string[] Disallowed => m_Disallowed; private static string[] m_StartDisallowed = new string[] { @@ -204,4 +204,4 @@ namespace Server.Misc "origin" }; } -} \ No newline at end of file +} diff --git a/Scripts/Misc/Poison.cs b/Scripts/Misc/Poison.cs index ebfac0b1f..0fffdec42 100644 --- a/Scripts/Misc/Poison.cs +++ b/Scripts/Misc/Poison.cs @@ -65,8 +65,8 @@ namespace Server m_MessageInterval = messageInterval; } - public override string Name{ get{ return m_Name; } } - public override int Level{ get{ return m_Level; } } + public override string Name => m_Name; + public override int Level => m_Level; public class PoisonTimer : Timer { @@ -153,4 +153,4 @@ namespace Server return new PoisonTimer( m, this ); } } -} \ No newline at end of file +} diff --git a/Scripts/Misc/ResourceInfo.cs b/Scripts/Misc/ResourceInfo.cs index 2ffd52d18..65f91b858 100644 --- a/Scripts/Misc/ResourceInfo.cs +++ b/Scripts/Misc/ResourceInfo.cs @@ -501,9 +501,7 @@ namespace Server.Items if ( m_TypeTable == null ) return CraftResource.None; - CraftResource res; - - if (!m_TypeTable.TryGetValue(resourceType, out res)) + if (!m_TypeTable.TryGetValue(resourceType, out CraftResource res)) return CraftResource.None; return res; @@ -723,4 +721,4 @@ namespace Server.Items } } } -} \ No newline at end of file +} diff --git a/Scripts/Misc/TextDefinition.cs b/Scripts/Misc/TextDefinition.cs index 201950fa5..ad1152cc9 100644 --- a/Scripts/Misc/TextDefinition.cs +++ b/Scripts/Misc/TextDefinition.cs @@ -12,8 +12,8 @@ namespace Server private int m_Number; private string m_String; - public int Number { get { return m_Number; } } - public string String { get { return m_String; } } + public int Number => m_Number; + public string String => m_String; public bool IsEmpty { get { return ( m_Number <= 0 && m_String == null ); } } diff --git a/Scripts/Misc/Weather.cs b/Scripts/Misc/Weather.cs index b2f69a0a5..7249ab446 100644 --- a/Scripts/Misc/Weather.cs +++ b/Scripts/Misc/Weather.cs @@ -17,7 +17,7 @@ namespace Server.Misc m_Facets = new Map[]{ Map.Felucca, Map.Trammel }; /* Static weather: - * + * * Format: * AddWeather( temperature, chanceOfPercipitation, chanceOfExtremeTemperature, ); */ @@ -33,7 +33,7 @@ namespace Server.Misc /* Dynamic weather: - * + * * Format: * AddDynamicWeather( temperature, chanceOfPercipitation, chanceOfExtremeTemperature, moveSpeed, width, height, bounds ); */ @@ -47,8 +47,7 @@ namespace Server.Misc if ( facet == null ) return null; - List list = null; - m_WeatherByFacet.TryGetValue( facet, out list ); + m_WeatherByFacet.TryGetValue( facet, out List list ); if ( list == null ) m_WeatherByFacet[facet] = list = new List(); @@ -391,4 +390,4 @@ namespace Server.Misc int version = reader.ReadInt(); } } -} \ No newline at end of file +} diff --git a/Scripts/Mobiles/AI/SpeedInfo.cs b/Scripts/Mobiles/AI/SpeedInfo.cs index d40753f28..39e3d5e7d 100644 --- a/Scripts/Mobiles/AI/SpeedInfo.cs +++ b/Scripts/Mobiles/AI/SpeedInfo.cs @@ -48,9 +48,7 @@ namespace Server if ( m_Table == null ) LoadTable(); - SpeedInfo sp = null; - - m_Table.TryGetValue(obj.GetType(), out sp); + m_Table.TryGetValue( obj.GetType(), out SpeedInfo sp ); return ( sp != null ); } @@ -63,9 +61,7 @@ namespace Server if ( m_Table == null ) LoadTable(); - SpeedInfo sp = null; - - m_Table.TryGetValue(obj.GetType(), out sp); + m_Table.TryGetValue( obj.GetType(), out SpeedInfo sp ); if ( sp == null ) return false; diff --git a/Scripts/Mobiles/Animals/Bears/BlackBear.cs b/Scripts/Mobiles/Animals/Bears/BlackBear.cs index 0fffef3b3..6c5722774 100644 --- a/Scripts/Mobiles/Animals/Bears/BlackBear.cs +++ b/Scripts/Mobiles/Animals/Bears/BlackBear.cs @@ -44,10 +44,10 @@ namespace Server.Mobiles MinTameSkill = 35.1; } - public override int Meat{ get{ return 1; } } - public override int Hides{ get{ return 12; } } - public override FoodType FavoriteFood{ get{ return FoodType.Fish | FoodType.Meat | FoodType.FruitsAndVegies; } } - public override PackInstinct PackInstinct{ get{ return PackInstinct.Bear; } } + public override int Meat => 1; + public override int Hides => 12; + public override FoodType FavoriteFood => FoodType.Fish | FoodType.Meat | FoodType.FruitsAndVegies; + public override PackInstinct PackInstinct => PackInstinct.Bear; public BlackBear( Serial serial ) : base( serial ) { diff --git a/Scripts/Mobiles/Animals/Bears/BrownBear.cs b/Scripts/Mobiles/Animals/Bears/BrownBear.cs index 6612a8055..299a6d912 100644 --- a/Scripts/Mobiles/Animals/Bears/BrownBear.cs +++ b/Scripts/Mobiles/Animals/Bears/BrownBear.cs @@ -43,10 +43,10 @@ namespace Server.Mobiles MinTameSkill = 41.1; } - public override int Meat{ get{ return 1; } } - public override int Hides{ get{ return 12; } } - public override FoodType FavoriteFood{ get{ return FoodType.Fish | FoodType.FruitsAndVegies | FoodType.Meat; } } - public override PackInstinct PackInstinct{ get{ return PackInstinct.Bear; } } + public override int Meat => 1; + public override int Hides => 12; + public override FoodType FavoriteFood => FoodType.Fish | FoodType.FruitsAndVegies | FoodType.Meat; + public override PackInstinct PackInstinct => PackInstinct.Bear; public BrownBear( Serial serial ) : base( serial ) { diff --git a/Scripts/Mobiles/Animals/Bears/GrizzlyBear.cs b/Scripts/Mobiles/Animals/Bears/GrizzlyBear.cs index c6f1b469a..6b83b04e8 100644 --- a/Scripts/Mobiles/Animals/Bears/GrizzlyBear.cs +++ b/Scripts/Mobiles/Animals/Bears/GrizzlyBear.cs @@ -45,10 +45,10 @@ namespace Server.Mobiles MinTameSkill = 59.1; } - public override int Meat{ get{ return 2; } } - public override int Hides{ get{ return 16; } } - public override FoodType FavoriteFood{ get{ return FoodType.Fish | FoodType.FruitsAndVegies | FoodType.Meat; } } - public override PackInstinct PackInstinct{ get{ return PackInstinct.Bear; } } + public override int Meat => 2; + public override int Hides => 16; + public override FoodType FavoriteFood => FoodType.Fish | FoodType.FruitsAndVegies | FoodType.Meat; + public override PackInstinct PackInstinct => PackInstinct.Bear; public GrizzlyBear( Serial serial ) : base( serial ) { diff --git a/Scripts/Mobiles/Animals/Bears/PolarBear.cs b/Scripts/Mobiles/Animals/Bears/PolarBear.cs index d90be8733..b5ec1202e 100644 --- a/Scripts/Mobiles/Animals/Bears/PolarBear.cs +++ b/Scripts/Mobiles/Animals/Bears/PolarBear.cs @@ -45,10 +45,10 @@ namespace Server.Mobiles MinTameSkill = 35.1; } - public override int Meat{ get{ return 2; } } - public override int Hides{ get{ return 16; } } - public override FoodType FavoriteFood{ get{ return FoodType.Fish | FoodType.FruitsAndVegies | FoodType.Meat; } } - public override PackInstinct PackInstinct{ get{ return PackInstinct.Bear; } } + public override int Meat => 2; + public override int Hides => 16; + public override FoodType FavoriteFood => FoodType.Fish | FoodType.FruitsAndVegies | FoodType.Meat; + public override PackInstinct PackInstinct => PackInstinct.Bear; public PolarBear( Serial serial ) : base( serial ) { diff --git a/Scripts/Mobiles/Animals/Birds/Chicken.cs b/Scripts/Mobiles/Animals/Birds/Chicken.cs index 806f94a93..dbc197f5d 100644 --- a/Scripts/Mobiles/Animals/Birds/Chicken.cs +++ b/Scripts/Mobiles/Animals/Birds/Chicken.cs @@ -41,12 +41,12 @@ namespace Server.Mobiles MinTameSkill = -0.9; } - public override int Meat{ get{ return 1; } } - public override MeatType MeatType{ get{ return MeatType.Bird; } } - public override FoodType FavoriteFood{ get{ return FoodType.GrainsAndHay; } } + public override int Meat => 1; + public override MeatType MeatType => MeatType.Bird; + public override FoodType FavoriteFood => FoodType.GrainsAndHay; public override bool CanFly => true; - public override int Feathers{ get{ return 25; } } + public override int Feathers => 25; public Chicken(Serial serial) : base(serial) { diff --git a/Scripts/Mobiles/Animals/Birds/Crane.cs b/Scripts/Mobiles/Animals/Birds/Crane.cs index 0be925d3b..e0ffd87aa 100644 --- a/Scripts/Mobiles/Animals/Birds/Crane.cs +++ b/Scripts/Mobiles/Animals/Birds/Crane.cs @@ -37,8 +37,8 @@ namespace Server.Mobiles VirtualArmor = 5; } - public override int Meat{ get{ return 1; } } - public override int Feathers{ get{ return 25; } } + public override int Meat => 1; + public override int Feathers => 25; public override int GetAngerSound() diff --git a/Scripts/Mobiles/Animals/Birds/Eagle.cs b/Scripts/Mobiles/Animals/Birds/Eagle.cs index 95b59bd6c..1643cf59a 100644 --- a/Scripts/Mobiles/Animals/Birds/Eagle.cs +++ b/Scripts/Mobiles/Animals/Birds/Eagle.cs @@ -46,10 +46,10 @@ namespace Server.Mobiles MinTameSkill = 17.1; } - public override int Meat{ get{ return 1; } } - public override MeatType MeatType{ get{ return MeatType.Bird; } } - public override int Feathers{ get{ return 36; } } - public override FoodType FavoriteFood{ get{ return FoodType.Meat | FoodType.Fish; } } + public override int Meat => 1; + public override MeatType MeatType => MeatType.Bird; + public override int Feathers => 36; + public override FoodType FavoriteFood => FoodType.Meat | FoodType.Fish; public override bool CanFly => true; public Eagle(Serial serial) : base(serial) diff --git a/Scripts/Mobiles/Animals/Birds/Phoenix.cs b/Scripts/Mobiles/Animals/Birds/Phoenix.cs index 1a10f33ea..d6be4d3f5 100644 --- a/Scripts/Mobiles/Animals/Birds/Phoenix.cs +++ b/Scripts/Mobiles/Animals/Birds/Phoenix.cs @@ -51,9 +51,9 @@ namespace Server.Mobiles AddLoot( LootPack.Rich ); } - public override int Meat{ get{ return 1; } } - public override MeatType MeatType{ get{ return MeatType.Bird; } } - public override int Feathers{ get{ return 36; } } + public override int Meat => 1; + public override MeatType MeatType => MeatType.Bird; + public override int Feathers => 36; public override bool CanFly => true; public Phoenix( Serial serial ) : base( serial ) diff --git a/Scripts/Mobiles/Animals/Canines/DireWolf.cs b/Scripts/Mobiles/Animals/Canines/DireWolf.cs index 21ca0b58d..49b7385f6 100644 --- a/Scripts/Mobiles/Animals/Canines/DireWolf.cs +++ b/Scripts/Mobiles/Animals/Canines/DireWolf.cs @@ -46,11 +46,11 @@ namespace Server.Mobiles MinTameSkill = 83.1; } - public override int Meat{ get{ return 1; } } - public override int Hides{ get{ return 7; } } - public override HideType HideType{ get{ return HideType.Spined; } } - public override FoodType FavoriteFood{ get{ return FoodType.Meat; } } - public override PackInstinct PackInstinct{ get{ return PackInstinct.Canine; } } + public override int Meat => 1; + public override int Hides => 7; + public override HideType HideType => HideType.Spined; + public override FoodType FavoriteFood => FoodType.Meat; + public override PackInstinct PackInstinct => PackInstinct.Canine; public DireWolf(Serial serial) : base(serial) { diff --git a/Scripts/Mobiles/Animals/Canines/GreyWolf.cs b/Scripts/Mobiles/Animals/Canines/GreyWolf.cs index b0a42bc01..4beb1e8c0 100644 --- a/Scripts/Mobiles/Animals/Canines/GreyWolf.cs +++ b/Scripts/Mobiles/Animals/Canines/GreyWolf.cs @@ -46,10 +46,10 @@ namespace Server.Mobiles MinTameSkill = 53.1; } - public override int Meat{ get{ return 1; } } - public override int Hides{ get{ return 6; } } - public override FoodType FavoriteFood{ get{ return FoodType.Meat; } } - public override PackInstinct PackInstinct{ get{ return PackInstinct.Canine; } } + public override int Meat => 1; + public override int Hides => 6; + public override FoodType FavoriteFood => FoodType.Meat; + public override PackInstinct PackInstinct => PackInstinct.Canine; public GreyWolf(Serial serial) : base(serial) { diff --git a/Scripts/Mobiles/Animals/Canines/TimberWolf.cs b/Scripts/Mobiles/Animals/Canines/TimberWolf.cs index a29c6d0dd..0530f5a41 100644 --- a/Scripts/Mobiles/Animals/Canines/TimberWolf.cs +++ b/Scripts/Mobiles/Animals/Canines/TimberWolf.cs @@ -46,10 +46,10 @@ namespace Server.Mobiles MinTameSkill = 23.1; } - public override int Meat{ get{ return 1; } } - public override int Hides{ get{ return 5; } } - public override FoodType FavoriteFood{ get{ return FoodType.Meat; } } - public override PackInstinct PackInstinct{ get{ return PackInstinct.Canine; } } + public override int Meat => 1; + public override int Hides => 5; + public override FoodType FavoriteFood => FoodType.Meat; + public override PackInstinct PackInstinct => PackInstinct.Canine; public TimberWolf(Serial serial) : base(serial) { diff --git a/Scripts/Mobiles/Animals/Canines/WhiteWolf.cs b/Scripts/Mobiles/Animals/Canines/WhiteWolf.cs index b81fdaeeb..5758f51c0 100644 --- a/Scripts/Mobiles/Animals/Canines/WhiteWolf.cs +++ b/Scripts/Mobiles/Animals/Canines/WhiteWolf.cs @@ -46,10 +46,10 @@ namespace Server.Mobiles MinTameSkill = 65.1; } - public override int Meat{ get{ return 1; } } - public override int Hides{ get{ return 6; } } - public override FoodType FavoriteFood{ get{ return FoodType.Meat; } } - public override PackInstinct PackInstinct{ get{ return PackInstinct.Canine; } } + public override int Meat => 1; + public override int Hides => 6; + public override FoodType FavoriteFood => FoodType.Meat; + public override PackInstinct PackInstinct => PackInstinct.Canine; public WhiteWolf( Serial serial ) : base( serial ) { diff --git a/Scripts/Mobiles/Animals/Cows/Bull.cs b/Scripts/Mobiles/Animals/Cows/Bull.cs index 5ba855604..a146d2896 100644 --- a/Scripts/Mobiles/Animals/Cows/Bull.cs +++ b/Scripts/Mobiles/Animals/Cows/Bull.cs @@ -45,10 +45,10 @@ namespace Server.Mobiles MinTameSkill = 71.1; } - public override int Meat{ get{ return 10; } } - public override int Hides{ get{ return 15; } } - public override FoodType FavoriteFood{ get{ return FoodType.GrainsAndHay; } } - public override PackInstinct PackInstinct{ get{ return PackInstinct.Bull; } } + public override int Meat => 10; + public override int Hides => 15; + public override FoodType FavoriteFood => FoodType.GrainsAndHay; + public override PackInstinct PackInstinct => PackInstinct.Bull; public Bull(Serial serial) : base(serial) { diff --git a/Scripts/Mobiles/Animals/Cows/Cow.cs b/Scripts/Mobiles/Animals/Cows/Cow.cs index c6a3fb75e..40431c42b 100644 --- a/Scripts/Mobiles/Animals/Cows/Cow.cs +++ b/Scripts/Mobiles/Animals/Cows/Cow.cs @@ -64,9 +64,9 @@ namespace Server.Mobiles FightMode = FightMode.Closest; } - public override int Meat{ get{ return 8; } } - public override int Hides{ get{ return 12; } } - public override FoodType FavoriteFood{ get{ return FoodType.FruitsAndVegies | FoodType.GrainsAndHay; } } + public override int Meat => 8; + public override int Hides => 12; + public override FoodType FavoriteFood => FoodType.FruitsAndVegies | FoodType.GrainsAndHay; public override void OnDoubleClick( Mobile from ) { diff --git a/Scripts/Mobiles/Animals/Felines/Cougar.cs b/Scripts/Mobiles/Animals/Felines/Cougar.cs index a2fe5a70c..c4e064bd2 100644 --- a/Scripts/Mobiles/Animals/Felines/Cougar.cs +++ b/Scripts/Mobiles/Animals/Felines/Cougar.cs @@ -44,10 +44,10 @@ namespace Server.Mobiles MinTameSkill = 41.1; } - public override int Meat{ get{ return 1; } } - public override int Hides{ get{ return 10; } } - public override FoodType FavoriteFood{ get{ return FoodType.Fish | FoodType.Meat; } } - public override PackInstinct PackInstinct{ get{ return PackInstinct.Feline; } } + public override int Meat => 1; + public override int Hides => 10; + public override FoodType FavoriteFood => FoodType.Fish | FoodType.Meat; + public override PackInstinct PackInstinct => PackInstinct.Feline; public Cougar(Serial serial) : base(serial) { diff --git a/Scripts/Mobiles/Animals/Felines/HellCat.cs b/Scripts/Mobiles/Animals/Felines/HellCat.cs index 979072b76..bd691bda3 100644 --- a/Scripts/Mobiles/Animals/Felines/HellCat.cs +++ b/Scripts/Mobiles/Animals/Felines/HellCat.cs @@ -52,10 +52,10 @@ namespace Server.Mobiles } public override bool HasBreath => true; // fire breath enabled - public override int Hides{ get{ return 10; } } - public override HideType HideType{ get{ return HideType.Spined; } } - public override FoodType FavoriteFood{ get{ return FoodType.Meat; } } - public override PackInstinct PackInstinct{ get{ return PackInstinct.Feline; } } + public override int Hides => 10; + public override HideType HideType => HideType.Spined; + public override FoodType FavoriteFood => FoodType.Meat; + public override PackInstinct PackInstinct => PackInstinct.Feline; public HellCat(Serial serial) : base(serial) { diff --git a/Scripts/Mobiles/Animals/Felines/Panther.cs b/Scripts/Mobiles/Animals/Felines/Panther.cs index 3b4909087..6a4889922 100644 --- a/Scripts/Mobiles/Animals/Felines/Panther.cs +++ b/Scripts/Mobiles/Animals/Felines/Panther.cs @@ -45,10 +45,10 @@ namespace Server.Mobiles MinTameSkill = 53.1; } - public override int Meat{ get{ return 1; } } - public override int Hides{ get{ return 10; } } - public override FoodType FavoriteFood{ get{ return FoodType.Meat | FoodType.Fish; } } - public override PackInstinct PackInstinct{ get{ return PackInstinct.Feline; } } + public override int Meat => 1; + public override int Hides => 10; + public override FoodType FavoriteFood => FoodType.Meat | FoodType.Fish; + public override PackInstinct PackInstinct => PackInstinct.Feline; public Panther(Serial serial) : base(serial) { diff --git a/Scripts/Mobiles/Animals/Felines/PredatorHellCat.cs b/Scripts/Mobiles/Animals/Felines/PredatorHellCat.cs index 637253a83..31449971e 100644 --- a/Scripts/Mobiles/Animals/Felines/PredatorHellCat.cs +++ b/Scripts/Mobiles/Animals/Felines/PredatorHellCat.cs @@ -50,10 +50,10 @@ namespace Server.Mobiles } public override bool HasBreath => true; // fire breath enabled - public override int Hides{ get{ return 10; } } - public override HideType HideType{ get{ return HideType.Spined; } } - public override FoodType FavoriteFood{ get{ return FoodType.Meat; } } - public override PackInstinct PackInstinct{ get{ return PackInstinct.Feline; } } + public override int Hides => 10; + public override HideType HideType => HideType.Spined; + public override FoodType FavoriteFood => FoodType.Meat; + public override PackInstinct PackInstinct => PackInstinct.Feline; public PredatorHellCat(Serial serial) : base(serial) { diff --git a/Scripts/Mobiles/Animals/Felines/SnowLeopard.cs b/Scripts/Mobiles/Animals/Felines/SnowLeopard.cs index 40b6c60b9..531d812bd 100644 --- a/Scripts/Mobiles/Animals/Felines/SnowLeopard.cs +++ b/Scripts/Mobiles/Animals/Felines/SnowLeopard.cs @@ -46,10 +46,10 @@ namespace Server.Mobiles MinTameSkill = 53.1; } - public override int Meat{ get{ return 1; } } - public override int Hides{ get{ return 8; } } - public override FoodType FavoriteFood{ get{ return FoodType.Meat | FoodType.Fish; } } - public override PackInstinct PackInstinct{ get{ return PackInstinct.Feline; } } + public override int Meat => 1; + public override int Hides => 8; + public override FoodType FavoriteFood => FoodType.Meat | FoodType.Fish; + public override PackInstinct PackInstinct => PackInstinct.Feline; public SnowLeopard(Serial serial) : base(serial) { diff --git a/Scripts/Mobiles/Animals/Misc/Boar.cs b/Scripts/Mobiles/Animals/Misc/Boar.cs index bdef8b6c8..d8d424119 100644 --- a/Scripts/Mobiles/Animals/Misc/Boar.cs +++ b/Scripts/Mobiles/Animals/Misc/Boar.cs @@ -43,8 +43,8 @@ namespace Server.Mobiles MinTameSkill = 29.1; } - public override int Meat{ get{ return 2; } } - public override FoodType FavoriteFood{ get{ return FoodType.FruitsAndVegies | FoodType.GrainsAndHay; } } + public override int Meat => 2; + public override FoodType FavoriteFood => FoodType.FruitsAndVegies | FoodType.GrainsAndHay; public Boar(Serial serial) : base(serial) { diff --git a/Scripts/Mobiles/Animals/Misc/BullFrog.cs b/Scripts/Mobiles/Animals/Misc/BullFrog.cs index 9e4007f26..1fbf6b217 100644 --- a/Scripts/Mobiles/Animals/Misc/BullFrog.cs +++ b/Scripts/Mobiles/Animals/Misc/BullFrog.cs @@ -48,9 +48,9 @@ namespace Server.Mobiles AddLoot( LootPack.Poor ); } - public override int Meat{ get{ return 1; } } - public override int Hides{ get{ return 4; } } - public override FoodType FavoriteFood{ get{ return FoodType.Fish | FoodType.Meat; } } + public override int Meat => 1; + public override int Hides => 4; + public override FoodType FavoriteFood => FoodType.Fish | FoodType.Meat; public BullFrog(Serial serial) : base(serial) { diff --git a/Scripts/Mobiles/Animals/Misc/Dolphin.cs b/Scripts/Mobiles/Animals/Misc/Dolphin.cs index 7921d8a39..c8531167c 100644 --- a/Scripts/Mobiles/Animals/Misc/Dolphin.cs +++ b/Scripts/Mobiles/Animals/Misc/Dolphin.cs @@ -43,7 +43,7 @@ namespace Server.Mobiles CantWalk = true; } - public override int Meat { get { return 1; } } + public override int Meat => 1; public Dolphin( Serial serial ) : base( serial ) diff --git a/Scripts/Mobiles/Animals/Misc/Gaman.cs b/Scripts/Mobiles/Animals/Misc/Gaman.cs index 54ecd971e..c32c821c8 100644 --- a/Scripts/Mobiles/Animals/Misc/Gaman.cs +++ b/Scripts/Mobiles/Animals/Misc/Gaman.cs @@ -68,9 +68,9 @@ namespace Server.Mobiles return 0x4F5; } - public override int Meat{ get{ return 10; } } - public override int Hides{ get{ return 15; } } - public override FoodType FavoriteFood{ get{ return FoodType.GrainsAndHay; } } + public override int Meat => 10; + public override int Hides => 15; + public override FoodType FavoriteFood => FoodType.GrainsAndHay; public override void OnDeath( Container c ) { diff --git a/Scripts/Mobiles/Animals/Misc/GiantToad.cs b/Scripts/Mobiles/Animals/Misc/GiantToad.cs index 68a494b19..8aeef91db 100644 --- a/Scripts/Mobiles/Animals/Misc/GiantToad.cs +++ b/Scripts/Mobiles/Animals/Misc/GiantToad.cs @@ -49,9 +49,9 @@ namespace Server.Mobiles AddLoot( LootPack.Poor ); } - public override int Hides{ get{ return 12; } } - public override HideType HideType{ get{ return HideType.Spined; } } - public override FoodType FavoriteFood{ get{ return FoodType.Fish | FoodType.Meat; } } + public override int Hides => 12; + public override HideType HideType => HideType.Spined; + public override FoodType FavoriteFood => FoodType.Fish | FoodType.Meat; public GiantToad(Serial serial) : base(serial) { diff --git a/Scripts/Mobiles/Animals/Misc/Goat.cs b/Scripts/Mobiles/Animals/Misc/Goat.cs index 2088d027f..d4646adaa 100644 --- a/Scripts/Mobiles/Animals/Misc/Goat.cs +++ b/Scripts/Mobiles/Animals/Misc/Goat.cs @@ -41,9 +41,9 @@ namespace Server.Mobiles MinTameSkill = 11.1; } - public override int Meat{ get{ return 2; } } - public override int Hides{ get{ return 8; } } - public override FoodType FavoriteFood{ get{ return FoodType.GrainsAndHay | FoodType.FruitsAndVegies; } } + public override int Meat => 2; + public override int Hides => 8; + public override FoodType FavoriteFood => FoodType.GrainsAndHay | FoodType.FruitsAndVegies; public Goat(Serial serial) : base(serial) { diff --git a/Scripts/Mobiles/Animals/Misc/Gorilla.cs b/Scripts/Mobiles/Animals/Misc/Gorilla.cs index 75b41bf9c..96336d898 100644 --- a/Scripts/Mobiles/Animals/Misc/Gorilla.cs +++ b/Scripts/Mobiles/Animals/Misc/Gorilla.cs @@ -43,9 +43,9 @@ namespace Server.Mobiles MinTameSkill = -18.9; } - public override int Meat{ get{ return 1; } } - public override int Hides{ get{ return 6; } } - public override FoodType FavoriteFood{ get{ return FoodType.FruitsAndVegies | FoodType.GrainsAndHay; } } + public override int Meat => 1; + public override int Hides => 6; + public override FoodType FavoriteFood => FoodType.FruitsAndVegies | FoodType.GrainsAndHay; public Gorilla(Serial serial) : base(serial) { diff --git a/Scripts/Mobiles/Animals/Misc/GreatHart.cs b/Scripts/Mobiles/Animals/Misc/GreatHart.cs index 6441ae1f3..121132ee9 100644 --- a/Scripts/Mobiles/Animals/Misc/GreatHart.cs +++ b/Scripts/Mobiles/Animals/Misc/GreatHart.cs @@ -42,9 +42,9 @@ namespace Server.Mobiles MinTameSkill = 59.1; } - public override int Meat{ get{ return 6; } } - public override int Hides{ get{ return 15; } } - public override FoodType FavoriteFood{ get{ return FoodType.FruitsAndVegies | FoodType.GrainsAndHay; } } + public override int Meat => 6; + public override int Hides => 15; + public override FoodType FavoriteFood => FoodType.FruitsAndVegies | FoodType.GrainsAndHay; public GreatHart(Serial serial) : base(serial) { diff --git a/Scripts/Mobiles/Animals/Misc/Hind.cs b/Scripts/Mobiles/Animals/Misc/Hind.cs index 62bbeb7c1..76c50c024 100644 --- a/Scripts/Mobiles/Animals/Misc/Hind.cs +++ b/Scripts/Mobiles/Animals/Misc/Hind.cs @@ -41,9 +41,9 @@ namespace Server.Mobiles MinTameSkill = 23.1; } - public override int Meat{ get{ return 5; } } - public override int Hides{ get{ return 8; } } - public override FoodType FavoriteFood{ get{ return FoodType.FruitsAndVegies | FoodType.GrainsAndHay; } } + public override int Meat => 5; + public override int Hides => 8; + public override FoodType FavoriteFood => FoodType.FruitsAndVegies | FoodType.GrainsAndHay; public Hind(Serial serial) : base(serial) { diff --git a/Scripts/Mobiles/Animals/Misc/Llama.cs b/Scripts/Mobiles/Animals/Misc/Llama.cs index 630eec26b..2281183a9 100644 --- a/Scripts/Mobiles/Animals/Misc/Llama.cs +++ b/Scripts/Mobiles/Animals/Misc/Llama.cs @@ -41,9 +41,9 @@ namespace Server.Mobiles MinTameSkill = 35.1; } - public override int Meat{ get{ return 1; } } - public override int Hides{ get{ return 12; } } - public override FoodType FavoriteFood{ get{ return FoodType.FruitsAndVegies | FoodType.GrainsAndHay; } } + public override int Meat => 1; + public override int Hides => 12; + public override FoodType FavoriteFood => FoodType.FruitsAndVegies | FoodType.GrainsAndHay; public Llama(Serial serial) : base(serial) { diff --git a/Scripts/Mobiles/Animals/Misc/MountainGoat.cs b/Scripts/Mobiles/Animals/Misc/MountainGoat.cs index a31a1ac10..882e35e2b 100644 --- a/Scripts/Mobiles/Animals/Misc/MountainGoat.cs +++ b/Scripts/Mobiles/Animals/Misc/MountainGoat.cs @@ -45,9 +45,9 @@ namespace Server.Mobiles MinTameSkill = -0.9; } - public override int Meat{ get{ return 2; } } - public override int Hides{ get{ return 12; } } - public override FoodType FavoriteFood{ get{ return FoodType.GrainsAndHay | FoodType.FruitsAndVegies; } } + public override int Meat => 2; + public override int Hides => 12; + public override FoodType FavoriteFood => FoodType.GrainsAndHay | FoodType.FruitsAndVegies; public MountainGoat(Serial serial) : base(serial) { diff --git a/Scripts/Mobiles/Animals/Misc/PackHorse.cs b/Scripts/Mobiles/Animals/Misc/PackHorse.cs index 678739574..d7679ce8d 100644 --- a/Scripts/Mobiles/Animals/Misc/PackHorse.cs +++ b/Scripts/Mobiles/Animals/Misc/PackHorse.cs @@ -60,9 +60,9 @@ namespace Server.Mobiles AddItem( pack ); } - public override int Meat{ get{ return 3; } } - public override int Hides{ get{ return 10; } } - public override FoodType FavoriteFood{ get{ return FoodType.FruitsAndVegies | FoodType.GrainsAndHay; } } + public override int Meat => 3; + public override int Hides => 10; + public override FoodType FavoriteFood => FoodType.FruitsAndVegies | FoodType.GrainsAndHay; public PackHorse( Serial serial ) : base( serial ) { diff --git a/Scripts/Mobiles/Animals/Misc/PackLlama.cs b/Scripts/Mobiles/Animals/Misc/PackLlama.cs index 695711c82..a24cd7a00 100644 --- a/Scripts/Mobiles/Animals/Misc/PackLlama.cs +++ b/Scripts/Mobiles/Animals/Misc/PackLlama.cs @@ -59,8 +59,8 @@ namespace Server.Mobiles AddItem( pack ); } - public override int Meat{ get{ return 1; } } - public override FoodType FavoriteFood{ get{ return FoodType.FruitsAndVegies | FoodType.GrainsAndHay; } } + public override int Meat => 1; + public override FoodType FavoriteFood => FoodType.FruitsAndVegies | FoodType.GrainsAndHay; public PackLlama( Serial serial ) : base( serial ) { diff --git a/Scripts/Mobiles/Animals/Misc/Pig.cs b/Scripts/Mobiles/Animals/Misc/Pig.cs index 22b4f20e6..c8c5addba 100644 --- a/Scripts/Mobiles/Animals/Misc/Pig.cs +++ b/Scripts/Mobiles/Animals/Misc/Pig.cs @@ -41,8 +41,8 @@ namespace Server.Mobiles MinTameSkill = 11.1; } - public override int Meat{ get{ return 1; } } - public override FoodType FavoriteFood{ get{ return FoodType.FruitsAndVegies | FoodType.GrainsAndHay; } } + public override int Meat => 1; + public override FoodType FavoriteFood => FoodType.FruitsAndVegies | FoodType.GrainsAndHay; public Pig(Serial serial) : base(serial) { diff --git a/Scripts/Mobiles/Animals/Misc/Sheep.cs b/Scripts/Mobiles/Animals/Misc/Sheep.cs index 493838a86..6257cb28c 100644 --- a/Scripts/Mobiles/Animals/Misc/Sheep.cs +++ b/Scripts/Mobiles/Animals/Misc/Sheep.cs @@ -74,11 +74,11 @@ namespace Server.Mobiles MinTameSkill = 11.1; } - public override int Meat{ get{ return 3; } } - public override MeatType MeatType{ get{ return MeatType.LambLeg; } } - public override FoodType FavoriteFood{ get{ return FoodType.FruitsAndVegies | FoodType.GrainsAndHay; } } + public override int Meat => 3; + public override MeatType MeatType => MeatType.LambLeg; + public override FoodType FavoriteFood => FoodType.FruitsAndVegies | FoodType.GrainsAndHay; - public override int Wool{ get{ return (Body == 0xCF ? 3 : 0); } } + public override int Wool => (Body == 0xCF ? 3 : 0); public Sheep( Serial serial ) : base( serial ) { diff --git a/Scripts/Mobiles/Animals/Misc/Walrus.cs b/Scripts/Mobiles/Animals/Misc/Walrus.cs index d9150605e..8ca72a2ff 100644 --- a/Scripts/Mobiles/Animals/Misc/Walrus.cs +++ b/Scripts/Mobiles/Animals/Misc/Walrus.cs @@ -45,9 +45,9 @@ namespace Server.Mobiles MinTameSkill = 35.1; } - public override int Meat{ get{ return 1; } } - public override int Hides{ get{ return 12; } } - public override FoodType FavoriteFood{ get{ return FoodType.Fish; } } + public override int Meat => 1; + public override int Hides => 12; + public override FoodType FavoriteFood => FoodType.Fish; public Walrus(Serial serial) : base(serial) { diff --git a/Scripts/Mobiles/Animals/Mounts/BaseMount.cs b/Scripts/Mobiles/Animals/Mounts/BaseMount.cs index a7b4ca820..258441c8d 100644 --- a/Scripts/Mobiles/Animals/Mounts/BaseMount.cs +++ b/Scripts/Mobiles/Animals/Mounts/BaseMount.cs @@ -12,7 +12,7 @@ namespace Server.Mobiles private Item m_InternalItem; private DateTime m_NextMountAbility; - public virtual TimeSpan MountAbilityDelay { get { return TimeSpan.Zero; } } + public virtual TimeSpan MountAbilityDelay => TimeSpan.Zero; [CommandProperty( AccessLevel.GameMaster )] public DateTime NextMountAbility @@ -317,7 +317,7 @@ namespace Server.Mobiles { private BaseMount m_Mount; - public override double DefaultWeight { get { return 0; } } + public override double DefaultWeight => 0; public MountItem( BaseMount mount, int itemID ) : base( itemID ) { diff --git a/Scripts/Mobiles/Animals/Mounts/Beetle.cs b/Scripts/Mobiles/Animals/Mounts/Beetle.cs index acbf3c6df..adc85eb90 100644 --- a/Scripts/Mobiles/Animals/Mounts/Beetle.cs +++ b/Scripts/Mobiles/Animals/Mounts/Beetle.cs @@ -87,7 +87,7 @@ namespace Server.Mobiles return 0x21D; } - public override FoodType FavoriteFood{ get{ return FoodType.Meat; } } + public override FoodType FavoriteFood => FoodType.Meat; public Beetle( Serial serial ) : base( serial ) { diff --git a/Scripts/Mobiles/Animals/Mounts/DesertOstard.cs b/Scripts/Mobiles/Animals/Mounts/DesertOstard.cs index ecaf7e388..06112e788 100644 --- a/Scripts/Mobiles/Animals/Mounts/DesertOstard.cs +++ b/Scripts/Mobiles/Animals/Mounts/DesertOstard.cs @@ -42,9 +42,9 @@ namespace Server.Mobiles MinTameSkill = 29.1; } - public override int Meat{ get{ return 3; } } - public override FoodType FavoriteFood{ get{ return FoodType.FruitsAndVegies | FoodType.GrainsAndHay; } } - public override PackInstinct PackInstinct{ get{ return PackInstinct.Ostard; } } + public override int Meat => 3; + public override FoodType FavoriteFood => FoodType.FruitsAndVegies | FoodType.GrainsAndHay; + public override PackInstinct PackInstinct => PackInstinct.Ostard; public DesertOstard( Serial serial ) : base( serial ) { @@ -64,4 +64,4 @@ namespace Server.Mobiles int version = reader.ReadInt(); } } -} \ No newline at end of file +} diff --git a/Scripts/Mobiles/Animals/Mounts/Ethereals.cs b/Scripts/Mobiles/Animals/Mounts/Ethereals.cs index ca7e81e15..7a541116e 100644 --- a/Scripts/Mobiles/Animals/Mounts/Ethereals.cs +++ b/Scripts/Mobiles/Animals/Mounts/Ethereals.cs @@ -104,7 +104,7 @@ namespace Server.Mobiles public override bool DisplayLootType => false; - public virtual int FollowerSlots { get { return 1; } } + public virtual int FollowerSlots => 1; public void RemoveFollowers() { @@ -287,7 +287,7 @@ namespace Server.Mobiles } } - public virtual int EtherealHue { get { return 0x4001; } } + public virtual int EtherealHue => 0x4001; public void UnmountMe() { @@ -375,7 +375,7 @@ namespace Server.Mobiles return TimeSpan.Zero; } - public override double CastDelayFastScalar { get { return 0; } } + public override double CastDelayFastScalar => 0; public override TimeSpan CastDelayBase { @@ -448,7 +448,7 @@ namespace Server.Mobiles public class EtherealHorse : EtherealMount { - public override int LabelNumber { get { return 1041298; } } // Ethereal Horse Statuette + public override int LabelNumber => 1041298; // Ethereal Horse Statuette [Constructible] public EtherealHorse() @@ -484,7 +484,7 @@ namespace Server.Mobiles public class EtherealLlama : EtherealMount { - public override int LabelNumber { get { return 1041300; } } // Ethereal Llama Statuette + public override int LabelNumber => 1041300; // Ethereal Llama Statuette [Constructible] public EtherealLlama() @@ -517,7 +517,7 @@ namespace Server.Mobiles public class EtherealOstard : EtherealMount { - public override int LabelNumber { get { return 1041299; } } // Ethereal Ostard Statuette + public override int LabelNumber => 1041299; // Ethereal Ostard Statuette [Constructible] public EtherealOstard() @@ -550,7 +550,7 @@ namespace Server.Mobiles public class EtherealRidgeback : EtherealMount { - public override int LabelNumber { get { return 1049747; } } // Ethereal Ridgeback Statuette + public override int LabelNumber => 1049747; // Ethereal Ridgeback Statuette [Constructible] public EtherealRidgeback() @@ -583,7 +583,7 @@ namespace Server.Mobiles public class EtherealUnicorn : EtherealMount { - public override int LabelNumber { get { return 1049745; } } // Ethereal Unicorn Statuette + public override int LabelNumber => 1049745; // Ethereal Unicorn Statuette [Constructible] public EtherealUnicorn() @@ -616,7 +616,7 @@ namespace Server.Mobiles public class EtherealBeetle : EtherealMount { - public override int LabelNumber { get { return 1049748; } } // Ethereal Beetle Statuette + public override int LabelNumber => 1049748; // Ethereal Beetle Statuette [Constructible] public EtherealBeetle() @@ -649,7 +649,7 @@ namespace Server.Mobiles public class EtherealKirin : EtherealMount { - public override int LabelNumber { get { return 1049746; } } // Ethereal Ki-Rin Statuette + public override int LabelNumber => 1049746; // Ethereal Ki-Rin Statuette [Constructible] public EtherealKirin() @@ -682,7 +682,7 @@ namespace Server.Mobiles public class EtherealSwampDragon : EtherealMount { - public override int LabelNumber { get { return 1049749; } } // Ethereal Swamp Dragon Statuette + public override int LabelNumber => 1049749; // Ethereal Swamp Dragon Statuette [Constructible] public EtherealSwampDragon() @@ -715,8 +715,8 @@ namespace Server.Mobiles public class RideablePolarBear : EtherealMount { - public override int LabelNumber { get { return 1076159; } } // Rideable Polar Bear - public override int EtherealHue { get { return 0; } } + public override int LabelNumber => 1076159; // Rideable Polar Bear + public override int EtherealHue => 0; [Constructible] public RideablePolarBear() @@ -746,7 +746,7 @@ namespace Server.Mobiles public class EtherealCuSidhe : EtherealMount { - public override int LabelNumber { get { return 1080386; } } // Ethereal Cu Sidhe Statuette + public override int LabelNumber => 1080386; // Ethereal Cu Sidhe Statuette [Constructible] public EtherealCuSidhe() @@ -776,7 +776,7 @@ namespace Server.Mobiles public class EtherealHiryu : EtherealMount { - public override int LabelNumber { get { return 1113813; } } // Ethereal Hiryu Statuette + public override int LabelNumber => 1113813; // Ethereal Hiryu Statuette [Constructible] public EtherealHiryu() @@ -806,7 +806,7 @@ namespace Server.Mobiles public class EtherealReptalon : EtherealMount { - public override int LabelNumber { get { return 1113812; } } // Ethereal Reptalon Statuette + public override int LabelNumber => 1113812; // Ethereal Reptalon Statuette [Constructible] public EtherealReptalon() @@ -836,7 +836,7 @@ namespace Server.Mobiles public class ChargerOfTheFallen : EtherealMount { - public override int LabelNumber { get { return 1074816; } } // Charger of the Fallen Statuette + public override int LabelNumber => 1074816; // Charger of the Fallen Statuette [Constructible] public ChargerOfTheFallen() @@ -844,7 +844,7 @@ namespace Server.Mobiles { } - public override int EtherealHue { get { return 0; } } + public override int EtherealHue => 0; public ChargerOfTheFallen( Serial serial ) : base( serial ) diff --git a/Scripts/Mobiles/Animals/Mounts/FireSteed.cs b/Scripts/Mobiles/Animals/Mounts/FireSteed.cs index 07a450293..2ed5246aa 100644 --- a/Scripts/Mobiles/Animals/Mounts/FireSteed.cs +++ b/Scripts/Mobiles/Animals/Mounts/FireSteed.cs @@ -53,8 +53,8 @@ namespace Server.Mobiles } public override bool HasBreath => true; // fire breath enabled - public override FoodType FavoriteFood{ get{ return FoodType.Meat; } } - public override PackInstinct PackInstinct{ get{ return PackInstinct.Daemon | PackInstinct.Equine; } } + public override FoodType FavoriteFood => FoodType.Meat; + public override PackInstinct PackInstinct => PackInstinct.Daemon | PackInstinct.Equine; public FireSteed( Serial serial ) : base( serial ) { diff --git a/Scripts/Mobiles/Animals/Mounts/ForestOstard.cs b/Scripts/Mobiles/Animals/Mounts/ForestOstard.cs index 1334834c7..9bf1be852 100644 --- a/Scripts/Mobiles/Animals/Mounts/ForestOstard.cs +++ b/Scripts/Mobiles/Animals/Mounts/ForestOstard.cs @@ -43,9 +43,9 @@ namespace Server.Mobiles MinTameSkill = 29.1; } - public override int Meat{ get{ return 3; } } - public override FoodType FavoriteFood{ get{ return FoodType.FruitsAndVegies | FoodType.GrainsAndHay; } } - public override PackInstinct PackInstinct{ get{ return PackInstinct.Ostard; } } + public override int Meat => 3; + public override FoodType FavoriteFood => FoodType.FruitsAndVegies | FoodType.GrainsAndHay; + public override PackInstinct PackInstinct => PackInstinct.Ostard; public ForestOstard( Serial serial ) : base( serial ) { @@ -65,4 +65,4 @@ namespace Server.Mobiles int version = reader.ReadInt(); } } -} \ No newline at end of file +} diff --git a/Scripts/Mobiles/Animals/Mounts/FrenziedOstard.cs b/Scripts/Mobiles/Animals/Mounts/FrenziedOstard.cs index b4af42f86..6a9ca10da 100644 --- a/Scripts/Mobiles/Animals/Mounts/FrenziedOstard.cs +++ b/Scripts/Mobiles/Animals/Mounts/FrenziedOstard.cs @@ -46,9 +46,9 @@ namespace Server.Mobiles MinTameSkill = 77.1; } - public override int Meat{ get{ return 3; } } - public override FoodType FavoriteFood{ get{ return FoodType.Meat | FoodType.Fish | FoodType.Eggs | FoodType.FruitsAndVegies; } } - public override PackInstinct PackInstinct{ get{ return PackInstinct.Ostard; } } + public override int Meat => 3; + public override FoodType FavoriteFood => FoodType.Meat | FoodType.Fish | FoodType.Eggs | FoodType.FruitsAndVegies; + public override PackInstinct PackInstinct => PackInstinct.Ostard; public FrenziedOstard( Serial serial ) : base( serial ) { @@ -68,4 +68,4 @@ namespace Server.Mobiles int version = reader.ReadInt(); } } -} \ No newline at end of file +} diff --git a/Scripts/Mobiles/Animals/Mounts/HellSteed.cs b/Scripts/Mobiles/Animals/Mounts/HellSteed.cs index 99bf6dfdc..639490341 100644 --- a/Scripts/Mobiles/Animals/Mounts/HellSteed.cs +++ b/Scripts/Mobiles/Animals/Mounts/HellSteed.cs @@ -7,7 +7,7 @@ namespace Server.Mobiles public class HellSteed : BaseMount { public override bool HasBreath => true; - public override int BreathChaosDamage { get { return 100; } } + public override int BreathChaosDamage => 100; public override Poison PoisonImmune => Poison.Lethal; [Constructible] diff --git a/Scripts/Mobiles/Animals/Mounts/Hiryu.cs b/Scripts/Mobiles/Animals/Mounts/Hiryu.cs index 35aa8356c..2eb3be044 100644 --- a/Scripts/Mobiles/Animals/Mounts/Hiryu.cs +++ b/Scripts/Mobiles/Animals/Mounts/Hiryu.cs @@ -8,7 +8,7 @@ namespace Server.Mobiles [CorpseName( "a hiryu corpse" )] public class Hiryu : BaseMount { - public override double WeaponAbilityChance { get { return 0.07; } } /* 1 in 15 chance of using per landed hit */ + public override double WeaponAbilityChance => 0.07; /* 1 in 15 chance of using per landed hit */ public override WeaponAbility GetWeaponAbility() => WeaponAbility.Dismount; @@ -146,10 +146,10 @@ namespace Server.Mobiles AddLoot( LootPack.Gems, 4 ); } - public override int TreasureMapLevel { get { return 5; } } - public override int Meat { get { return 16; } } - public override int Hides { get { return 60; } } - public override FoodType FavoriteFood { get { return FoodType.Meat; } } + public override int TreasureMapLevel => 5; + public override int Meat => 16; + public override int Hides => 60; + public override FoodType FavoriteFood => FoodType.Meat; public override bool CanAngerOnTame => true; public override void OnGaveMeleeAttack( Mobile defender ) diff --git a/Scripts/Mobiles/Animals/Mounts/Horse.cs b/Scripts/Mobiles/Animals/Mounts/Horse.cs index 6f46d1295..9528dd0b6 100644 --- a/Scripts/Mobiles/Animals/Mounts/Horse.cs +++ b/Scripts/Mobiles/Animals/Mounts/Horse.cs @@ -54,9 +54,9 @@ namespace Server.Mobiles MinTameSkill = 29.1; } - public override int Meat{ get{ return 3; } } - public override int Hides{ get{ return 10; } } - public override FoodType FavoriteFood{ get{ return FoodType.FruitsAndVegies | FoodType.GrainsAndHay; } } + public override int Meat => 3; + public override int Hides => 10; + public override FoodType FavoriteFood => FoodType.FruitsAndVegies | FoodType.GrainsAndHay; public Horse( Serial serial ) : base( serial ) { @@ -76,4 +76,4 @@ namespace Server.Mobiles int version = reader.ReadInt(); } } -} \ No newline at end of file +} diff --git a/Scripts/Mobiles/Animals/Mounts/Kirin.cs b/Scripts/Mobiles/Animals/Mounts/Kirin.cs index b59ea99c5..f71155b64 100644 --- a/Scripts/Mobiles/Animals/Mounts/Kirin.cs +++ b/Scripts/Mobiles/Animals/Mounts/Kirin.cs @@ -13,7 +13,7 @@ namespace Server.Mobiles public override bool InitialInnocent => true; - public override TimeSpan MountAbilityDelay { get { return TimeSpan.FromHours( 1.0 ); } } + public override TimeSpan MountAbilityDelay => TimeSpan.FromHours( 1.0 ); public override void OnDisallowedRider( Mobile m ) { @@ -104,10 +104,10 @@ namespace Server.Mobiles get{ return OppositionGroup.FeyAndUndead; } } - public override int Meat{ get{ return 3; } } - public override int Hides{ get{ return 10; } } - public override HideType HideType{ get{ return HideType.Horned; } } - public override FoodType FavoriteFood{ get{ return FoodType.FruitsAndVegies | FoodType.GrainsAndHay; } } + public override int Meat => 3; + public override int Hides => 10; + public override HideType HideType => HideType.Horned; + public override FoodType FavoriteFood => FoodType.FruitsAndVegies | FoodType.GrainsAndHay; public Kirin( Serial serial ) : base( serial ) { diff --git a/Scripts/Mobiles/Animals/Mounts/LesserHiryu.cs b/Scripts/Mobiles/Animals/Mounts/LesserHiryu.cs index 2d5648a85..61b526fa7 100644 --- a/Scripts/Mobiles/Animals/Mounts/LesserHiryu.cs +++ b/Scripts/Mobiles/Animals/Mounts/LesserHiryu.cs @@ -8,7 +8,7 @@ namespace Server.Mobiles [CorpseName( "a hiryu corpse" )] public class LesserHiryu : BaseMount { - public override double WeaponAbilityChance { get { return 0.07; } } /* 1 in 15 chance of using; 1 in 5 chance of success */ + public override double WeaponAbilityChance => 0.07; /* 1 in 15 chance of using; 1 in 5 chance of success */ public override WeaponAbility GetWeaponAbility() => WeaponAbility.Dismount; @@ -146,10 +146,10 @@ namespace Server.Mobiles return bushidoChance > tamingChance ? bushidoChance : tamingChance; } - public override int TreasureMapLevel { get { return 3; } } - public override int Meat { get { return 16; } } - public override int Hides { get { return 60; } } - public override FoodType FavoriteFood { get { return FoodType.Meat; } } + public override int TreasureMapLevel => 3; + public override int Meat => 16; + public override int Hides => 60; + public override FoodType FavoriteFood => FoodType.Meat; public override bool CanAngerOnTame => true; public override void OnGaveMeleeAttack( Mobile defender ) diff --git a/Scripts/Mobiles/Animals/Mounts/Nightmare.cs b/Scripts/Mobiles/Animals/Mounts/Nightmare.cs index ce994180d..3eb5f99dc 100644 --- a/Scripts/Mobiles/Animals/Mounts/Nightmare.cs +++ b/Scripts/Mobiles/Animals/Mounts/Nightmare.cs @@ -93,10 +93,10 @@ namespace Server.Mobiles } public override bool HasBreath => true; // fire breath enabled - public override int Meat{ get{ return 5; } } - public override int Hides{ get{ return 10; } } - public override HideType HideType{ get{ return HideType.Barbed; } } - public override FoodType FavoriteFood{ get{ return FoodType.Meat; } } + public override int Meat => 5; + public override int Hides => 10; + public override HideType HideType => HideType.Barbed; + public override FoodType FavoriteFood => FoodType.Meat; public override bool CanAngerOnTame => true; public Nightmare( Serial serial ) : base( serial ) diff --git a/Scripts/Mobiles/Animals/Mounts/RidableLlama.cs b/Scripts/Mobiles/Animals/Mounts/RidableLlama.cs index 4a7f9d1a1..96b3fc5db 100644 --- a/Scripts/Mobiles/Animals/Mounts/RidableLlama.cs +++ b/Scripts/Mobiles/Animals/Mounts/RidableLlama.cs @@ -45,9 +45,9 @@ namespace Server.Mobiles MinTameSkill = 29.1; } - public override int Meat{ get{ return 1; } } - public override int Hides{ get{ return 12; } } - public override FoodType FavoriteFood{ get{ return FoodType.FruitsAndVegies | FoodType.GrainsAndHay; } } + public override int Meat => 1; + public override int Hides => 12; + public override FoodType FavoriteFood => FoodType.FruitsAndVegies | FoodType.GrainsAndHay; public RidableLlama( Serial serial ) : base( serial ) { @@ -67,4 +67,4 @@ namespace Server.Mobiles int version = reader.ReadInt(); } } -} \ No newline at end of file +} diff --git a/Scripts/Mobiles/Animals/Mounts/Ridgeback.cs b/Scripts/Mobiles/Animals/Mounts/Ridgeback.cs index f7f61cbc5..3442f7108 100644 --- a/Scripts/Mobiles/Animals/Mounts/Ridgeback.cs +++ b/Scripts/Mobiles/Animals/Mounts/Ridgeback.cs @@ -55,10 +55,10 @@ namespace Server.Mobiles return 1.0; } - public override int Meat{ get{ return 1; } } - public override int Hides{ get{ return 12; } } - public override HideType HideType{ get{ return HideType.Spined; } } - public override FoodType FavoriteFood{ get{ return FoodType.FruitsAndVegies | FoodType.GrainsAndHay; } } + public override int Meat => 1; + public override int Hides => 12; + public override HideType HideType => HideType.Spined; + public override FoodType FavoriteFood => FoodType.FruitsAndVegies | FoodType.GrainsAndHay; public Ridgeback( Serial serial ) : base( serial ) { @@ -78,4 +78,4 @@ namespace Server.Mobiles int version = reader.ReadInt(); } } -} \ No newline at end of file +} diff --git a/Scripts/Mobiles/Animals/Mounts/SavageRidgeback.cs b/Scripts/Mobiles/Animals/Mounts/SavageRidgeback.cs index b610f1a65..72762ae34 100644 --- a/Scripts/Mobiles/Animals/Mounts/SavageRidgeback.cs +++ b/Scripts/Mobiles/Animals/Mounts/SavageRidgeback.cs @@ -55,10 +55,10 @@ namespace Server.Mobiles return 1.0; } - public override int Meat{ get{ return 1; } } - public override int Hides{ get{ return 12; } } - public override HideType HideType{ get{ return HideType.Spined; } } - public override FoodType FavoriteFood{ get{ return FoodType.FruitsAndVegies | FoodType.GrainsAndHay; } } + public override int Meat => 1; + public override int Hides => 12; + public override HideType HideType => HideType.Spined; + public override FoodType FavoriteFood => FoodType.FruitsAndVegies | FoodType.GrainsAndHay; public SavageRidgeback( Serial serial ) : base( serial ) { @@ -78,4 +78,4 @@ namespace Server.Mobiles int version = reader.ReadInt(); } } -} \ No newline at end of file +} diff --git a/Scripts/Mobiles/Animals/Mounts/ScaledSwampDragon.cs b/Scripts/Mobiles/Animals/Mounts/ScaledSwampDragon.cs index 53c6583e9..c7e898840 100644 --- a/Scripts/Mobiles/Animals/Mounts/ScaledSwampDragon.cs +++ b/Scripts/Mobiles/Animals/Mounts/ScaledSwampDragon.cs @@ -55,7 +55,7 @@ namespace Server.Mobiles } public override bool AutoDispel => !Controlled; - public override FoodType FavoriteFood{ get{ return FoodType.Meat; } } + public override FoodType FavoriteFood => FoodType.Meat; public ScaledSwampDragon( Serial serial ) : base( serial ) { diff --git a/Scripts/Mobiles/Animals/Mounts/SwampDragon.cs b/Scripts/Mobiles/Animals/Mounts/SwampDragon.cs index 3381107ab..e9b563b63 100644 --- a/Scripts/Mobiles/Animals/Mounts/SwampDragon.cs +++ b/Scripts/Mobiles/Animals/Mounts/SwampDragon.cs @@ -154,11 +154,11 @@ namespace Server.Mobiles public override bool ReacquireOnMovement => true; public override bool AutoDispel => !Controlled; - public override FoodType FavoriteFood{ get{ return FoodType.Meat; } } - public override int Meat{ get{ return 19; } } - public override int Hides{ get{ return 20; } } - public override int Scales{ get{ return 5; } } - public override ScaleType ScaleType{ get{ return ScaleType.Green; } } + public override FoodType FavoriteFood => FoodType.Meat; + public override int Meat => 19; + public override int Hides => 20; + public override int Scales => 5; + public override ScaleType ScaleType => ScaleType.Green; public override bool CanAngerOnTame => true; public SwampDragon( Serial serial ) : base( serial ) diff --git a/Scripts/Mobiles/Animals/Mounts/Unicorn.cs b/Scripts/Mobiles/Animals/Mounts/Unicorn.cs index f85a25065..e1ffc5f4c 100644 --- a/Scripts/Mobiles/Animals/Mounts/Unicorn.cs +++ b/Scripts/Mobiles/Animals/Mounts/Unicorn.cs @@ -13,7 +13,7 @@ namespace Server.Mobiles public override bool InitialInnocent => true; - public override TimeSpan MountAbilityDelay { get { return TimeSpan.FromHours( 1.0 ); } } + public override TimeSpan MountAbilityDelay => TimeSpan.FromHours( 1.0 ); public override void OnDisallowedRider( Mobile m ) { @@ -115,10 +115,10 @@ namespace Server.Mobiles } public override Poison PoisonImmune => Poison.Lethal; - public override int Meat{ get{ return 3; } } - public override int Hides{ get{ return 10; } } - public override HideType HideType{ get{ return HideType.Horned; } } - public override FoodType FavoriteFood{ get{ return FoodType.FruitsAndVegies | FoodType.GrainsAndHay; } } + public override int Meat => 3; + public override int Hides => 10; + public override HideType HideType => HideType.Horned; + public override FoodType FavoriteFood => FoodType.FruitsAndVegies | FoodType.GrainsAndHay; public Unicorn( Serial serial ) : base( serial ) { diff --git a/Scripts/Mobiles/Animals/Mounts/War Horses/BaseWarHorse.cs b/Scripts/Mobiles/Animals/Mounts/War Horses/BaseWarHorse.cs index d2bee37e8..b9dd2ba70 100644 --- a/Scripts/Mobiles/Animals/Mounts/War Horses/BaseWarHorse.cs +++ b/Scripts/Mobiles/Animals/Mounts/War Horses/BaseWarHorse.cs @@ -42,7 +42,7 @@ namespace Server.Mobiles MinTameSkill = 29.1; } - public override FoodType FavoriteFood{ get{ return FoodType.FruitsAndVegies | FoodType.GrainsAndHay; } } + public override FoodType FavoriteFood => FoodType.FruitsAndVegies | FoodType.GrainsAndHay; public BaseWarHorse( Serial serial ) : base( serial ) { @@ -62,4 +62,4 @@ namespace Server.Mobiles int version = reader.ReadInt(); } } -} \ No newline at end of file +} diff --git a/Scripts/Mobiles/Animals/Reptiles/Alligator.cs b/Scripts/Mobiles/Animals/Reptiles/Alligator.cs index 93ba24424..4dc5ab4ad 100644 --- a/Scripts/Mobiles/Animals/Reptiles/Alligator.cs +++ b/Scripts/Mobiles/Animals/Reptiles/Alligator.cs @@ -44,10 +44,10 @@ namespace Server.Mobiles MinTameSkill = 47.1; } - public override int Meat{ get{ return 1; } } - public override int Hides{ get{ return 12; } } - public override HideType HideType{ get{ return HideType.Spined; } } - public override FoodType FavoriteFood{ get{ return FoodType.Meat | FoodType.Fish; } } + public override int Meat => 1; + public override int Hides => 12; + public override HideType HideType => HideType.Spined; + public override FoodType FavoriteFood => FoodType.Meat | FoodType.Fish; public Alligator(Serial serial) : base(serial) { diff --git a/Scripts/Mobiles/Animals/Reptiles/GiantSerpent.cs b/Scripts/Mobiles/Animals/Reptiles/GiantSerpent.cs index cdbef67f7..566548e22 100644 --- a/Scripts/Mobiles/Animals/Reptiles/GiantSerpent.cs +++ b/Scripts/Mobiles/Animals/Reptiles/GiantSerpent.cs @@ -59,9 +59,9 @@ namespace Server.Mobiles public override bool DeathAdderCharmable => true; - public override int Meat{ get{ return 4; } } - public override int Hides{ get{ return 15; } } - public override HideType HideType{ get{ return HideType.Spined; } } + public override int Meat => 4; + public override int Hides => 15; + public override HideType HideType => HideType.Spined; public GiantSerpent(Serial serial) : base(serial) { diff --git a/Scripts/Mobiles/Animals/Reptiles/IceSerpent.cs b/Scripts/Mobiles/Animals/Reptiles/IceSerpent.cs index 1f9a3a3e8..c538ba7af 100644 --- a/Scripts/Mobiles/Animals/Reptiles/IceSerpent.cs +++ b/Scripts/Mobiles/Animals/Reptiles/IceSerpent.cs @@ -70,9 +70,9 @@ namespace Server.Mobiles public override bool DeathAdderCharmable => true; - public override int Meat{ get{ return 4; } } - public override int Hides{ get{ return 15; } } - public override HideType HideType{ get{ return HideType.Spined; } } + public override int Meat => 4; + public override int Hides => 15; + public override HideType HideType => HideType.Spined; public IceSerpent(Serial serial) : base(serial) { diff --git a/Scripts/Mobiles/Animals/Reptiles/IceSnake.cs b/Scripts/Mobiles/Animals/Reptiles/IceSnake.cs index 1de5fac7f..f7ecbc216 100644 --- a/Scripts/Mobiles/Animals/Reptiles/IceSnake.cs +++ b/Scripts/Mobiles/Animals/Reptiles/IceSnake.cs @@ -50,7 +50,7 @@ namespace Server.Mobiles public override bool DeathAdderCharmable => true; - public override int Meat{ get{ return 1; } } + public override int Meat => 1; public IceSnake(Serial serial) : base(serial) { diff --git a/Scripts/Mobiles/Animals/Reptiles/LavaLizard.cs b/Scripts/Mobiles/Animals/Reptiles/LavaLizard.cs index 95c8ae43f..4b59a2ed4 100644 --- a/Scripts/Mobiles/Animals/Reptiles/LavaLizard.cs +++ b/Scripts/Mobiles/Animals/Reptiles/LavaLizard.cs @@ -55,8 +55,8 @@ namespace Server.Mobiles } public override bool HasBreath => true; // fire breath enabled - public override int Hides{ get{ return 12; } } - public override HideType HideType{ get{ return HideType.Spined; } } + public override int Hides => 12; + public override HideType HideType => HideType.Spined; public LavaLizard(Serial serial) : base(serial) { diff --git a/Scripts/Mobiles/Animals/Reptiles/LavaSerpent.cs b/Scripts/Mobiles/Animals/Reptiles/LavaSerpent.cs index 376729f7f..767b7bfff 100644 --- a/Scripts/Mobiles/Animals/Reptiles/LavaSerpent.cs +++ b/Scripts/Mobiles/Animals/Reptiles/LavaSerpent.cs @@ -56,9 +56,9 @@ namespace Server.Mobiles public override bool DeathAdderCharmable => true; public override bool HasBreath => true; // fire breath enabled - public override int Meat{ get{ return 4; } } - public override int Hides{ get{ return 15; } } - public override HideType HideType{ get{ return HideType.Spined; } } + public override int Meat => 4; + public override int Hides => 15; + public override HideType HideType => HideType.Spined; public LavaSerpent(Serial serial) : base(serial) { diff --git a/Scripts/Mobiles/Animals/Reptiles/LavaSnake.cs b/Scripts/Mobiles/Animals/Reptiles/LavaSnake.cs index cbee64e07..94428693b 100644 --- a/Scripts/Mobiles/Animals/Reptiles/LavaSnake.cs +++ b/Scripts/Mobiles/Animals/Reptiles/LavaSnake.cs @@ -53,7 +53,7 @@ namespace Server.Mobiles public override bool DeathAdderCharmable => true; public override bool HasBreath => true; // fire breath enabled - public override int Meat{ get{ return 1; } } + public override int Meat => 1; public LavaSnake(Serial serial) : base(serial) { diff --git a/Scripts/Mobiles/Animals/Reptiles/SilverSerpent.cs b/Scripts/Mobiles/Animals/Reptiles/SilverSerpent.cs index 4f3511e7c..9fad4b5e9 100644 --- a/Scripts/Mobiles/Animals/Reptiles/SilverSerpent.cs +++ b/Scripts/Mobiles/Animals/Reptiles/SilverSerpent.cs @@ -8,8 +8,8 @@ namespace Server.Mobiles [TypeAlias( "Server.Mobiles.Silverserpant" )] public class SilverSerpent : BaseCreature { - public override Faction FactionAllegiance { get { return TrueBritannians.Instance; } } - public override Ethics.Ethic EthicAllegiance { get { return Ethics.Ethic.Hero; } } + public override Faction FactionAllegiance => TrueBritannians.Instance; + public override Ethics.Ethic EthicAllegiance => Ethics.Ethic.Hero; public override string DefaultName => "a silver serpent"; @@ -55,7 +55,7 @@ namespace Server.Mobiles public override bool DeathAdderCharmable => true; - public override int Meat{ get{ return 1; } } + public override int Meat => 1; public override Poison PoisonImmune => Poison.Lethal; public override Poison HitPoison => Poison.Lethal; diff --git a/Scripts/Mobiles/Animals/Reptiles/Snake.cs b/Scripts/Mobiles/Animals/Reptiles/Snake.cs index 3021bda47..5551a7f9a 100644 --- a/Scripts/Mobiles/Animals/Reptiles/Snake.cs +++ b/Scripts/Mobiles/Animals/Reptiles/Snake.cs @@ -49,8 +49,8 @@ namespace Server.Mobiles public override bool DeathAdderCharmable => true; - public override int Meat{ get{ return 1; } } - public override FoodType FavoriteFood{ get{ return FoodType.Eggs; } } + public override int Meat => 1; + public override FoodType FavoriteFood => FoodType.Eggs; public Snake(Serial serial) : base(serial) { diff --git a/Scripts/Mobiles/Animals/Rodents/GiantRat.cs b/Scripts/Mobiles/Animals/Rodents/GiantRat.cs index d82d5bb6f..bce002609 100644 --- a/Scripts/Mobiles/Animals/Rodents/GiantRat.cs +++ b/Scripts/Mobiles/Animals/Rodents/GiantRat.cs @@ -49,9 +49,9 @@ namespace Server.Mobiles AddLoot( LootPack.Poor ); } - public override int Meat{ get{ return 1; } } - public override int Hides{ get{ return 6; } } - public override FoodType FavoriteFood{ get{ return FoodType.Fish | FoodType.Meat | FoodType.FruitsAndVegies | FoodType.Eggs; } } + public override int Meat => 1; + public override int Hides => 6; + public override FoodType FavoriteFood => FoodType.Fish | FoodType.Meat | FoodType.FruitsAndVegies | FoodType.Eggs; public GiantRat(Serial serial) : base(serial) { diff --git a/Scripts/Mobiles/Animals/Rodents/JackRabbit.cs b/Scripts/Mobiles/Animals/Rodents/JackRabbit.cs index 3e36dea3f..a8337030a 100644 --- a/Scripts/Mobiles/Animals/Rodents/JackRabbit.cs +++ b/Scripts/Mobiles/Animals/Rodents/JackRabbit.cs @@ -42,9 +42,9 @@ namespace Server.Mobiles MinTameSkill = -18.9; } - public override int Meat{ get{ return 1; } } - public override int Hides{ get{ return 1; } } - public override FoodType FavoriteFood{ get{ return FoodType.FruitsAndVegies; } } + public override int Meat => 1; + public override int Hides => 1; + public override FoodType FavoriteFood => FoodType.FruitsAndVegies; public JackRabbit(Serial serial) : base(serial) { diff --git a/Scripts/Mobiles/Animals/Rodents/Rabbit.cs b/Scripts/Mobiles/Animals/Rodents/Rabbit.cs index ab00d875f..14a45b117 100644 --- a/Scripts/Mobiles/Animals/Rodents/Rabbit.cs +++ b/Scripts/Mobiles/Animals/Rodents/Rabbit.cs @@ -43,9 +43,9 @@ namespace Server.Mobiles MinTameSkill = -18.9; } - public override int Meat{ get{ return 1; } } - public override int Hides{ get{ return 1; } } - public override FoodType FavoriteFood{ get{ return FoodType.FruitsAndVegies; } } + public override int Meat => 1; + public override int Hides => 1; + public override FoodType FavoriteFood => FoodType.FruitsAndVegies; public Rabbit(Serial serial) : base(serial) { diff --git a/Scripts/Mobiles/Animals/Town Critters/Bird.cs b/Scripts/Mobiles/Animals/Town Critters/Bird.cs index 8700f4daa..16728cb4b 100644 --- a/Scripts/Mobiles/Animals/Town Critters/Bird.cs +++ b/Scripts/Mobiles/Animals/Town Critters/Bird.cs @@ -52,10 +52,10 @@ namespace Server.Mobiles MinTameSkill = -6.9; } - public override MeatType MeatType{ get{ return MeatType.Bird; } } - public override int Meat{ get{ return 1; } } - public override int Feathers{ get{ return 25; } } - public override FoodType FavoriteFood{ get{ return FoodType.FruitsAndVegies | FoodType.GrainsAndHay; } } + public override MeatType MeatType => MeatType.Bird; + public override int Meat => 1; + public override int Feathers => 25; + public override FoodType FavoriteFood => FoodType.FruitsAndVegies | FoodType.GrainsAndHay; public Bird( Serial serial ) : base( serial ) { @@ -114,10 +114,10 @@ namespace Server.Mobiles MinTameSkill = -6.9; } - public override MeatType MeatType{ get{ return MeatType.Bird; } } - public override int Meat{ get{ return 1; } } - public override int Feathers{ get{ return 25; } } - public override FoodType FavoriteFood{ get{ return FoodType.FruitsAndVegies | FoodType.GrainsAndHay; } } + public override MeatType MeatType => MeatType.Bird; + public override int Meat => 1; + public override int Feathers => 25; + public override FoodType FavoriteFood => FoodType.FruitsAndVegies | FoodType.GrainsAndHay; public TropicalBird( Serial serial ) : base( serial ) { diff --git a/Scripts/Mobiles/Animals/Town Critters/Cat.cs b/Scripts/Mobiles/Animals/Town Critters/Cat.cs index 9e521e24d..35847b981 100644 --- a/Scripts/Mobiles/Animals/Town Critters/Cat.cs +++ b/Scripts/Mobiles/Animals/Town Critters/Cat.cs @@ -43,9 +43,9 @@ namespace Server.Mobiles MinTameSkill = -0.9; } - public override int Meat{ get{ return 1; } } - public override FoodType FavoriteFood{ get{ return FoodType.Meat | FoodType.Fish; } } - public override PackInstinct PackInstinct{ get{ return PackInstinct.Feline; } } + public override int Meat => 1; + public override FoodType FavoriteFood => FoodType.Meat | FoodType.Fish; + public override PackInstinct PackInstinct => PackInstinct.Feline; public Cat(Serial serial) : base(serial) { diff --git a/Scripts/Mobiles/Animals/Town Critters/Dog.cs b/Scripts/Mobiles/Animals/Town Critters/Dog.cs index 979129c9e..bfda6593a 100644 --- a/Scripts/Mobiles/Animals/Town Critters/Dog.cs +++ b/Scripts/Mobiles/Animals/Town Critters/Dog.cs @@ -42,9 +42,9 @@ namespace Server.Mobiles MinTameSkill = -15.3; } - public override int Meat{ get{ return 1; } } - public override FoodType FavoriteFood{ get{ return FoodType.Meat; } } - public override PackInstinct PackInstinct{ get{ return PackInstinct.Canine; } } + public override int Meat => 1; + public override FoodType FavoriteFood => FoodType.Meat; + public override PackInstinct PackInstinct => PackInstinct.Canine; public Dog(Serial serial) : base(serial) { diff --git a/Scripts/Mobiles/Animals/Town Critters/Rat.cs b/Scripts/Mobiles/Animals/Town Critters/Rat.cs index 62ab81109..be73597a0 100644 --- a/Scripts/Mobiles/Animals/Town Critters/Rat.cs +++ b/Scripts/Mobiles/Animals/Town Critters/Rat.cs @@ -47,8 +47,8 @@ namespace Server.Mobiles AddLoot( LootPack.Poor ); } - public override int Meat{ get{ return 1; } } - public override FoodType FavoriteFood{ get{ return FoodType.Meat | FoodType.Fish | FoodType.Eggs | FoodType.GrainsAndHay; } } + public override int Meat => 1; + public override FoodType FavoriteFood => FoodType.Meat | FoodType.Fish | FoodType.Eggs | FoodType.GrainsAndHay; public Rat(Serial serial) : base(serial) { diff --git a/Scripts/Mobiles/BaseCreature.cs b/Scripts/Mobiles/BaseCreature.cs index a0ae78d3b..04154cf9e 100644 --- a/Scripts/Mobiles/BaseCreature.cs +++ b/Scripts/Mobiles/BaseCreature.cs @@ -360,14 +360,14 @@ namespace Server.Mobiles } public virtual bool CanGiveMLQuest { get { return ( MLQuests.Count != 0 ); } } - public virtual bool StaticMLQuester { get { return true; } } + public virtual bool StaticMLQuester => true; protected virtual List ConstructQuestList() { return null; } - public virtual bool CanShout { get { return false; } } + public virtual bool CanShout => false; public const int ShoutRange = 8; public static readonly TimeSpan ShoutDelay = TimeSpan.FromMinutes( 1 ); @@ -540,11 +540,11 @@ namespace Server.Mobiles #region Elemental Resistance/Damage - public override int BasePhysicalResistance{ get{ return m_PhysicalResistance; } } - public override int BaseFireResistance{ get{ return m_FireResistance; } } - public override int BaseColdResistance{ get{ return m_ColdResistance; } } - public override int BasePoisonResistance{ get{ return m_PoisonResistance; } } - public override int BaseEnergyResistance{ get{ return m_EnergyResistance; } } + public override int BasePhysicalResistance => m_PhysicalResistance; + public override int BaseFireResistance => m_FireResistance; + public override int BaseColdResistance => m_ColdResistance; + public override int BasePoisonResistance => m_PoisonResistance; + public override int BaseEnergyResistance => m_EnergyResistance; [CommandProperty( AccessLevel.GameMaster )] public int PhysicalResistanceSeed{ get{ return m_PhysicalResistance; } set{ m_PhysicalResistance = value; UpdateResistances(); } } @@ -603,12 +603,12 @@ namespace Server.Mobiles } } - public virtual bool HasManaOveride { get { return false; } } + public virtual bool HasManaOveride => false; public virtual FoodType FavoriteFood{ get{ return FoodType.Meat; } } public virtual PackInstinct PackInstinct{ get{ return PackInstinct.None; } } - public List Owners { get { return m_Owners; } } + public List Owners => m_Owners; public virtual bool AllowMaleTamer{ get{ return true; } } public virtual bool AllowFemaleTamer{ get{ return true; } } @@ -663,7 +663,7 @@ namespace Server.Mobiles public virtual int BreathRange{ get{ return RangePerception; } } // Damage types - public virtual int BreathChaosDamage{ get { return 0; } } + public virtual int BreathChaosDamage => 0; public virtual int BreathPhysicalDamage{ get{ return 0; } } public virtual int BreathFireDamage{ get{ return 100; } } public virtual int BreathColdDamage{ get{ return 0; } } @@ -802,7 +802,7 @@ namespace Server.Mobiles #endregion - public virtual bool CanFly { get { return false; } } + public virtual bool CanFly => false; #region Spill Acid @@ -893,7 +893,7 @@ namespace Server.Mobiles #endregion - public virtual bool IsInvulnerable { get { return false; } } + public virtual bool IsInvulnerable => false; public BaseAI AIObject{ get{ return m_AI; } } @@ -905,7 +905,7 @@ namespace Server.Mobiles } #region Friends - public List Friends { get { return m_Friends; } } + public List Friends => m_Friends; public virtual bool AllowNewPetFriend { @@ -949,7 +949,7 @@ namespace Server.Mobiles #endregion #region Allegiance - public virtual Ethics.Ethic EthicAllegiance { get { return null; } } + public virtual Ethics.Ethic EthicAllegiance => null; public enum Allegiance { @@ -3408,7 +3408,7 @@ namespace Server.Mobiles { } - public virtual bool CanDrop { get { return IsBonded; } } + public virtual bool CanDrop => IsBonded; public override void GetContextMenuEntries( Mobile from, List list ) { @@ -4566,7 +4566,7 @@ namespace Server.Mobiles public virtual double TreasureMapChance{ get{ return TreasureMap.LootChance; } } public virtual int TreasureMapLevel{ get{ return -1; } } - public virtual bool IgnoreYoungProtection { get { return false; } } + public virtual bool IgnoreYoungProtection => false; public override bool OnBeforeDeath() { @@ -5010,8 +5010,8 @@ namespace Server.Mobiles public virtual TimeSpan ReacquireDelay{ get{ return TimeSpan.FromSeconds( 10.0 ); } } public virtual bool ReacquireOnMovement{ get{ return false; } } - public virtual bool AcquireOnApproach{ get { return m_Paragon; } } - public virtual int AcquireOnApproachRange { get { return 10; } } + public virtual bool AcquireOnApproach => m_Paragon; + public virtual int AcquireOnApproachRange => 10; public override void OnDelete() { @@ -5200,21 +5200,21 @@ namespace Server.Mobiles public virtual bool IsDispellable { get { return Summoned && !IsAnimatedDead; } } #region Healing - public virtual bool CanHeal { get { return false; } } - public virtual bool CanHealOwner { get { return false; } } - public virtual double HealScalar { get { return 1.0; } } + public virtual bool CanHeal => false; + public virtual bool CanHealOwner => false; + public virtual double HealScalar => 1.0; - public virtual int HealSound { get { return 0x57; } } - public virtual int HealStartRange { get { return 2; } } - public virtual int HealEndRange { get { return RangePerception; } } - public virtual double HealTrigger { get { return 0.78; } } - public virtual double HealDelay { get { return 6.5; } } - public virtual double HealInterval { get { return 0.0; } } - public virtual bool HealFully { get { return true; } } - public virtual double HealOwnerTrigger { get { return 0.78; } } - public virtual double HealOwnerDelay { get { return 6.5; } } - public virtual double HealOwnerInterval { get { return 30.0; } } - public virtual bool HealOwnerFully { get { return false; } } + public virtual int HealSound => 0x57; + public virtual int HealStartRange => 2; + public virtual int HealEndRange => RangePerception; + public virtual double HealTrigger => 0.78; + public virtual double HealDelay => 6.5; + public virtual double HealInterval => 0.0; + public virtual bool HealFully => true; + public virtual double HealOwnerTrigger => 0.78; + public virtual double HealOwnerDelay => 6.5; + public virtual double HealOwnerInterval => 30.0; + public virtual bool HealOwnerFully => false; private long m_NextHealTime = Core.TickCount; private long m_NextHealOwnerTime = Core.TickCount; @@ -5336,17 +5336,17 @@ namespace Server.Mobiles #region Damaging Aura private long m_NextAura; - public virtual bool HasAura { get { return false; } } + public virtual bool HasAura => false; public virtual TimeSpan AuraInterval { get { return TimeSpan.FromSeconds( 5 ); } } - public virtual int AuraRange { get { return 4; } } + public virtual int AuraRange => 4; - public virtual int AuraBaseDamage { get { return 5; } } - public virtual int AuraPhysicalDamage { get { return 0; } } - public virtual int AuraFireDamage { get { return 100; } } - public virtual int AuraColdDamage { get { return 0; } } - public virtual int AuraPoisonDamage { get { return 0; } } - public virtual int AuraEnergyDamage { get { return 0; } } - public virtual int AuraChaosDamage { get { return 0; } } + public virtual int AuraBaseDamage => 5; + public virtual int AuraPhysicalDamage => 0; + public virtual int AuraFireDamage => 100; + public virtual int AuraColdDamage => 0; + public virtual int AuraPoisonDamage => 0; + public virtual int AuraEnergyDamage => 0; + public virtual int AuraChaosDamage => 0; public virtual void AuraDamage() { diff --git a/Scripts/Mobiles/Familiars/HordeMinion.cs b/Scripts/Mobiles/Familiars/HordeMinion.cs index 26631cd00..c9ed3adfb 100644 --- a/Scripts/Mobiles/Familiars/HordeMinion.cs +++ b/Scripts/Mobiles/Familiars/HordeMinion.cs @@ -12,7 +12,7 @@ namespace Server.Mobiles [CorpseName( "a horde minion corpse" )] public class HordeMinionFamiliar : BaseFamiliar { - public override bool DisplayWeight{ get { return true; } } + public override bool DisplayWeight => true; public override string DefaultName => "a horde minion"; diff --git a/Scripts/Mobiles/Healers/BaseHealer.cs b/Scripts/Mobiles/Healers/BaseHealer.cs index acb3ab915..1ae8de63a 100644 --- a/Scripts/Mobiles/Healers/BaseHealer.cs +++ b/Scripts/Mobiles/Healers/BaseHealer.cs @@ -61,7 +61,7 @@ namespace Server.Mobiles PackItem( new CurePotion() ); } - public override VendorShoeType ShoeType{ get{ return VendorShoeType.Sandals; } } + public override VendorShoeType ShoeType => VendorShoeType.Sandals; public virtual int GetRobeColor() { diff --git a/Scripts/Mobiles/Monsters/AOS/AbysmalHorror.cs b/Scripts/Mobiles/Monsters/AOS/AbysmalHorror.cs index 023d50dd9..bb21e76bc 100644 --- a/Scripts/Mobiles/Monsters/AOS/AbysmalHorror.cs +++ b/Scripts/Mobiles/Monsters/AOS/AbysmalHorror.cs @@ -9,7 +9,7 @@ namespace Server.Mobiles { public override WeaponAbility GetWeaponAbility() => Utility.RandomBool() ? WeaponAbility.MortalStrike : WeaponAbility.WhirlwindAttack; - public override bool IgnoreYoungProtection { get { return Core.ML; } } + public override bool IgnoreYoungProtection => Core.ML; public override string DefaultName => "an abysmal horror"; @@ -64,9 +64,9 @@ namespace Server.Mobiles public override bool BardImmune => !Core.SE; public override bool Unprovokable => Core.SE; - public override bool AreaPeaceImmune { get { return Core.SE; } } + public override bool AreaPeaceImmune => Core.SE; public override Poison PoisonImmune => Poison.Lethal; - public override int TreasureMapLevel{ get{ return 1; } } + public override int TreasureMapLevel => 1; public AbysmalHorror( Serial serial ) : base( serial ) { diff --git a/Scripts/Mobiles/Monsters/AOS/BoneDemon.cs b/Scripts/Mobiles/Monsters/AOS/BoneDemon.cs index 383001d1d..d6e3b90fc 100644 --- a/Scripts/Mobiles/Monsters/AOS/BoneDemon.cs +++ b/Scripts/Mobiles/Monsters/AOS/BoneDemon.cs @@ -51,11 +51,11 @@ namespace Server.Mobiles AddLoot( LootPack.FilthyRich, 8 ); } - public override bool BardImmune { get { return !Core.SE; } } - public override bool Unprovokable { get { return Core.SE; } } - public override bool AreaPeaceImmune { get { return Core.SE; } } + public override bool BardImmune => !Core.SE; + public override bool Unprovokable => Core.SE; + public override bool AreaPeaceImmune => Core.SE; public override Poison PoisonImmune => Poison.Lethal; - public override int TreasureMapLevel{ get{ return 1; } } + public override int TreasureMapLevel => 1; public BoneDemon( Serial serial ) : base( serial ) { diff --git a/Scripts/Mobiles/Monsters/AOS/CrystalElemental.cs b/Scripts/Mobiles/Monsters/AOS/CrystalElemental.cs index d00ec50f0..a4488319f 100644 --- a/Scripts/Mobiles/Monsters/AOS/CrystalElemental.cs +++ b/Scripts/Mobiles/Monsters/AOS/CrystalElemental.cs @@ -55,7 +55,7 @@ namespace Server.Mobiles public override bool BleedImmune => true; public override Poison PoisonImmune => Poison.Lethal; - public override int TreasureMapLevel{ get{ return 1; } } + public override int TreasureMapLevel => 1; public CrystalElemental( Serial serial ) : base( serial ) { diff --git a/Scripts/Mobiles/Monsters/AOS/DarknightCreeper.cs b/Scripts/Mobiles/Monsters/AOS/DarknightCreeper.cs index fe651c727..322fcfc02 100644 --- a/Scripts/Mobiles/Monsters/AOS/DarknightCreeper.cs +++ b/Scripts/Mobiles/Monsters/AOS/DarknightCreeper.cs @@ -7,7 +7,7 @@ namespace Server.Mobiles [CorpseName( "a darknight creeper corpse" )] public class DarknightCreeper : BaseCreature { - public override bool IgnoreYoungProtection { get { return Core.ML; } } + public override bool IgnoreYoungProtection => Core.ML; [Constructible] public DarknightCreeper() : base( AIType.AI_Mage, FightMode.Closest, 10, 1, 0.2, 0.4 ) @@ -65,12 +65,12 @@ namespace Server.Mobiles public override bool BardImmune => !Core.SE; public override bool Unprovokable => Core.SE; - public override bool AreaPeaceImmune { get { return Core.SE; } } + public override bool AreaPeaceImmune => Core.SE; public override bool BleedImmune => true; public override Poison PoisonImmune => Poison.Lethal; public override Poison HitPoison => Poison.Lethal; - public override int TreasureMapLevel{ get{ return 1; } } + public override int TreasureMapLevel => 1; public DarknightCreeper( Serial serial ) : base( serial ) { diff --git a/Scripts/Mobiles/Monsters/AOS/DemonKnight.cs b/Scripts/Mobiles/Monsters/AOS/DemonKnight.cs index 4c4b6e108..9b425fa08 100644 --- a/Scripts/Mobiles/Monsters/AOS/DemonKnight.cs +++ b/Scripts/Mobiles/Monsters/AOS/DemonKnight.cs @@ -217,10 +217,10 @@ namespace Server.Mobiles public override bool BardImmune => !Core.SE; public override bool Unprovokable => Core.SE; - public override bool AreaPeaceImmune { get { return Core.SE; } } + public override bool AreaPeaceImmune => Core.SE; public override Poison PoisonImmune => Poison.Lethal; - public override int TreasureMapLevel{ get{ return 1; } } + public override int TreasureMapLevel => 1; private static bool m_InHere; diff --git a/Scripts/Mobiles/Monsters/AOS/Devourer.cs b/Scripts/Mobiles/Monsters/AOS/Devourer.cs index c547e6875..262e95578 100644 --- a/Scripts/Mobiles/Monsters/AOS/Devourer.cs +++ b/Scripts/Mobiles/Monsters/AOS/Devourer.cs @@ -55,7 +55,7 @@ namespace Server.Mobiles public override Poison PoisonImmune => Poison.Lethal; - public override int Meat{ get{ return 3; } } + public override int Meat => 3; public Devourer( Serial serial ) : base( serial ) { diff --git a/Scripts/Mobiles/Monsters/AOS/FleshGolem.cs b/Scripts/Mobiles/Monsters/AOS/FleshGolem.cs index e1454064f..a994fbb05 100644 --- a/Scripts/Mobiles/Monsters/AOS/FleshGolem.cs +++ b/Scripts/Mobiles/Monsters/AOS/FleshGolem.cs @@ -49,7 +49,7 @@ namespace Server.Mobiles } public override bool BleedImmune => true; - public override int TreasureMapLevel{ get{ return 1; } } + public override int TreasureMapLevel => 1; public FleshGolem( Serial serial ) : base( serial ) { diff --git a/Scripts/Mobiles/Monsters/AOS/FleshRenderer.cs b/Scripts/Mobiles/Monsters/AOS/FleshRenderer.cs index 24025062b..c17a7766d 100644 --- a/Scripts/Mobiles/Monsters/AOS/FleshRenderer.cs +++ b/Scripts/Mobiles/Monsters/AOS/FleshRenderer.cs @@ -9,7 +9,7 @@ namespace Server.Mobiles { public override WeaponAbility GetWeaponAbility() => Utility.RandomBool() ? WeaponAbility.Dismount : WeaponAbility.ParalyzingBlow; - public override bool IgnoreYoungProtection { get { return Core.ML; } } + public override bool IgnoreYoungProtection => Core.ML; public override string DefaultName => "a fleshrenderer"; @@ -61,12 +61,12 @@ namespace Server.Mobiles } public override bool AutoDispel => true; - public override bool BardImmune { get { return !Core.SE; } } - public override bool Unprovokable { get { return Core.SE; } } - public override bool AreaPeaceImmune { get { return Core.SE; } } + public override bool BardImmune => !Core.SE; + public override bool Unprovokable => Core.SE; + public override bool AreaPeaceImmune => Core.SE; public override Poison PoisonImmune => Poison.Lethal; - public override int TreasureMapLevel{ get{ return 1; } } + public override int TreasureMapLevel => 1; public override int GetAttackSound() { diff --git a/Scripts/Mobiles/Monsters/AOS/Gibberling.cs b/Scripts/Mobiles/Monsters/AOS/Gibberling.cs index 963bb8325..05ac3f61e 100644 --- a/Scripts/Mobiles/Monsters/AOS/Gibberling.cs +++ b/Scripts/Mobiles/Monsters/AOS/Gibberling.cs @@ -50,7 +50,7 @@ namespace Server.Mobiles AddLoot( LootPack.Meager ); } - public override int TreasureMapLevel{ get{ return 1; } } + public override int TreasureMapLevel => 1; public Gibberling( Serial serial ) : base( serial ) { diff --git a/Scripts/Mobiles/Monsters/AOS/Impaler.cs b/Scripts/Mobiles/Monsters/AOS/Impaler.cs index 09b8a8f00..3d46582e8 100644 --- a/Scripts/Mobiles/Monsters/AOS/Impaler.cs +++ b/Scripts/Mobiles/Monsters/AOS/Impaler.cs @@ -9,7 +9,7 @@ namespace Server.Mobiles { public override WeaponAbility GetWeaponAbility() => Utility.RandomBool() ? WeaponAbility.MortalStrike : WeaponAbility.BleedAttack; - public override bool IgnoreYoungProtection { get { return Core.ML; } } + public override bool IgnoreYoungProtection => Core.ML; [Constructible] public Impaler() : base( AIType.AI_Melee, FightMode.Closest, 10, 1, 0.2, 0.4 ) @@ -63,11 +63,11 @@ namespace Server.Mobiles public override bool AutoDispel => true; public override bool BardImmune => !Core.SE; public override bool Unprovokable => Core.SE; - public override bool AreaPeaceImmune { get { return Core.SE; } } + public override bool AreaPeaceImmune => Core.SE; public override Poison PoisonImmune => Poison.Lethal; public override Poison HitPoison => (0.8 >= Utility.RandomDouble() ? Poison.Greater : Poison.Deadly); - public override int TreasureMapLevel{ get{ return 1; } } + public override int TreasureMapLevel => 1; public Impaler( Serial serial ) : base( serial ) { diff --git a/Scripts/Mobiles/Monsters/AOS/MoundOfMaggots.cs b/Scripts/Mobiles/Monsters/AOS/MoundOfMaggots.cs index 9a02f0ffb..7fcb722d4 100644 --- a/Scripts/Mobiles/Monsters/AOS/MoundOfMaggots.cs +++ b/Scripts/Mobiles/Monsters/AOS/MoundOfMaggots.cs @@ -46,7 +46,7 @@ namespace Server.Mobiles public override Poison PoisonImmune => Poison.Lethal; - public override int TreasureMapLevel{ get{ return 1; } } + public override int TreasureMapLevel => 1; public MoundOfMaggots( Serial serial ) : base( serial ) { diff --git a/Scripts/Mobiles/Monsters/AOS/PatchworkSkeleton.cs b/Scripts/Mobiles/Monsters/AOS/PatchworkSkeleton.cs index ddd101dc3..f756ac1ad 100644 --- a/Scripts/Mobiles/Monsters/AOS/PatchworkSkeleton.cs +++ b/Scripts/Mobiles/Monsters/AOS/PatchworkSkeleton.cs @@ -52,7 +52,7 @@ namespace Server.Mobiles public override bool BleedImmune => true; public override Poison PoisonImmune => Poison.Lethal; - public override int TreasureMapLevel{ get{ return 1; } } + public override int TreasureMapLevel => 1; public PatchworkSkeleton( Serial serial ) : base( serial ) { diff --git a/Scripts/Mobiles/Monsters/AOS/Revenant.cs b/Scripts/Mobiles/Monsters/AOS/Revenant.cs index 7a95c6e7f..bb15fa031 100644 --- a/Scripts/Mobiles/Monsters/AOS/Revenant.cs +++ b/Scripts/Mobiles/Monsters/AOS/Revenant.cs @@ -15,11 +15,11 @@ namespace Server.Mobiles // Do nothing } - public override Mobile ConstantFocus{ get{ return m_Target; } } + public override Mobile ConstantFocus => m_Target; public override bool NoHouseRestrictions => true; - public override double DispelDifficulty{ get{ return 80.0; } } - public override double DispelFocus{ get{ return 20.0; } } + public override double DispelDifficulty => 80.0; + public override double DispelFocus => 20.0; public override string DefaultName => "a revenant"; diff --git a/Scripts/Mobiles/Monsters/AOS/ShadowKnight.cs b/Scripts/Mobiles/Monsters/AOS/ShadowKnight.cs index 4b93c0ded..0fc323e5e 100644 --- a/Scripts/Mobiles/Monsters/AOS/ShadowKnight.cs +++ b/Scripts/Mobiles/Monsters/AOS/ShadowKnight.cs @@ -9,7 +9,7 @@ namespace Server.Mobiles { public override WeaponAbility GetWeaponAbility() => Utility.RandomBool() ? WeaponAbility.ConcussionBlow : WeaponAbility.CrushingBlow; - public override bool IgnoreYoungProtection { get { return Core.ML; } } + public override bool IgnoreYoungProtection => Core.ML; [Constructible] public ShadowKnight() : base( AIType.AI_Mage, FightMode.Closest, 10, 1, 0.2, 0.4 ) @@ -169,7 +169,7 @@ namespace Server.Mobiles public override bool AreaPeaceImmune => Core.SE; public override Poison PoisonImmune => Poison.Lethal; - public override int TreasureMapLevel{ get{ return 1; } } + public override int TreasureMapLevel => 1; public ShadowKnight( Serial serial ) : base( serial ) { diff --git a/Scripts/Mobiles/Monsters/AOS/SkitteringHopper.cs b/Scripts/Mobiles/Monsters/AOS/SkitteringHopper.cs index e2c935eaf..043c50798 100644 --- a/Scripts/Mobiles/Monsters/AOS/SkitteringHopper.cs +++ b/Scripts/Mobiles/Monsters/AOS/SkitteringHopper.cs @@ -48,7 +48,7 @@ namespace Server.Mobiles AddLoot( LootPack.Meager ); } - public override int TreasureMapLevel{ get{ return 1; } } + public override int TreasureMapLevel => 1; public SkitteringHopper( Serial serial ) : base( serial ) { diff --git a/Scripts/Mobiles/Monsters/AOS/WandererOfTheVoid.cs b/Scripts/Mobiles/Monsters/AOS/WandererOfTheVoid.cs index 99c3a1a14..0db176c40 100644 --- a/Scripts/Mobiles/Monsters/AOS/WandererOfTheVoid.cs +++ b/Scripts/Mobiles/Monsters/AOS/WandererOfTheVoid.cs @@ -53,7 +53,7 @@ namespace Server.Mobiles public override bool BleedImmune => true; public override Poison PoisonImmune => Poison.Lethal; - public override int TreasureMapLevel{ get{ return Core.AOS ? 4 : 1; } } + public override int TreasureMapLevel => Core.AOS ? 4 : 1; public override void GenerateLoot() { diff --git a/Scripts/Mobiles/Monsters/Arachnid/Magic/DreadSpider.cs b/Scripts/Mobiles/Monsters/Arachnid/Magic/DreadSpider.cs index 486a90e4e..c26fff7ac 100644 --- a/Scripts/Mobiles/Monsters/Arachnid/Magic/DreadSpider.cs +++ b/Scripts/Mobiles/Monsters/Arachnid/Magic/DreadSpider.cs @@ -54,7 +54,7 @@ namespace Server.Mobiles public override Poison PoisonImmune => Poison.Lethal; public override Poison HitPoison => Poison.Lethal; - public override int TreasureMapLevel{ get{ return 3; } } + public override int TreasureMapLevel => 3; public DreadSpider( Serial serial ) : base( serial ) { diff --git a/Scripts/Mobiles/Monsters/Arachnid/Magic/TerathanAvenger.cs b/Scripts/Mobiles/Monsters/Arachnid/Magic/TerathanAvenger.cs index d4c99e260..d3fe8fed4 100644 --- a/Scripts/Mobiles/Monsters/Arachnid/Magic/TerathanAvenger.cs +++ b/Scripts/Mobiles/Monsters/Arachnid/Magic/TerathanAvenger.cs @@ -53,8 +53,8 @@ namespace Server.Mobiles public override Poison PoisonImmune => Poison.Deadly; public override Poison HitPoison => Poison.Deadly; - public override int TreasureMapLevel{ get{ return 3; } } - public override int Meat{ get{ return 2; } } + public override int TreasureMapLevel => 3; + public override int Meat => 2; public override OppositionGroup OppositionGroup { diff --git a/Scripts/Mobiles/Monsters/Arachnid/Magic/TerathanMatriarch.cs b/Scripts/Mobiles/Monsters/Arachnid/Magic/TerathanMatriarch.cs index ab3c1946d..6e6aed84f 100644 --- a/Scripts/Mobiles/Monsters/Arachnid/Magic/TerathanMatriarch.cs +++ b/Scripts/Mobiles/Monsters/Arachnid/Magic/TerathanMatriarch.cs @@ -52,7 +52,7 @@ namespace Server.Mobiles AddLoot( LootPack.Potions ); } - public override int TreasureMapLevel{ get{ return 4; } } + public override int TreasureMapLevel => 4; public override OppositionGroup OppositionGroup { diff --git a/Scripts/Mobiles/Monsters/Arachnid/Melee/FrostSpider.cs b/Scripts/Mobiles/Monsters/Arachnid/Melee/FrostSpider.cs index d25fcce65..ca8900dc6 100644 --- a/Scripts/Mobiles/Monsters/Arachnid/Melee/FrostSpider.cs +++ b/Scripts/Mobiles/Monsters/Arachnid/Melee/FrostSpider.cs @@ -54,8 +54,8 @@ namespace Server.Mobiles AddLoot( LootPack.Poor ); } - public override FoodType FavoriteFood{ get{ return FoodType.Meat; } } - public override PackInstinct PackInstinct{ get{ return PackInstinct.Arachnid; } } + public override FoodType FavoriteFood => FoodType.Meat; + public override PackInstinct PackInstinct => PackInstinct.Arachnid; public FrostSpider( Serial serial ) : base( serial ) { diff --git a/Scripts/Mobiles/Monsters/Arachnid/Melee/GiantBlackWidow.cs b/Scripts/Mobiles/Monsters/Arachnid/Melee/GiantBlackWidow.cs index 04d0767fb..9e12ecd78 100644 --- a/Scripts/Mobiles/Monsters/Arachnid/Melee/GiantBlackWidow.cs +++ b/Scripts/Mobiles/Monsters/Arachnid/Melee/GiantBlackWidow.cs @@ -53,7 +53,7 @@ namespace Server.Mobiles AddLoot( LootPack.Average ); } - public override FoodType FavoriteFood{ get{ return FoodType.Meat; } } + public override FoodType FavoriteFood => FoodType.Meat; public override Poison PoisonImmune => Poison.Deadly; public override Poison HitPoison => Poison.Deadly; diff --git a/Scripts/Mobiles/Monsters/Arachnid/Melee/GiantSpider.cs b/Scripts/Mobiles/Monsters/Arachnid/Melee/GiantSpider.cs index 5db1e672c..0ddd9f4fd 100644 --- a/Scripts/Mobiles/Monsters/Arachnid/Melee/GiantSpider.cs +++ b/Scripts/Mobiles/Monsters/Arachnid/Melee/GiantSpider.cs @@ -52,8 +52,8 @@ namespace Server.Mobiles AddLoot( LootPack.Poor ); } - public override FoodType FavoriteFood{ get{ return FoodType.Meat; } } - public override PackInstinct PackInstinct{ get{ return PackInstinct.Arachnid; } } + public override FoodType FavoriteFood => FoodType.Meat; + public override PackInstinct PackInstinct => PackInstinct.Arachnid; public override Poison PoisonImmune => Poison.Regular; public override Poison HitPoison => Poison.Regular; diff --git a/Scripts/Mobiles/Monsters/Arachnid/Melee/TerathanDrone.cs b/Scripts/Mobiles/Monsters/Arachnid/Melee/TerathanDrone.cs index 5f2b77e67..4d8b4d3a2 100644 --- a/Scripts/Mobiles/Monsters/Arachnid/Melee/TerathanDrone.cs +++ b/Scripts/Mobiles/Monsters/Arachnid/Melee/TerathanDrone.cs @@ -52,7 +52,7 @@ namespace Server.Mobiles // TODO: weapon? } - public override int Meat{ get{ return 4; } } + public override int Meat => 4; public override OppositionGroup OppositionGroup { diff --git a/Scripts/Mobiles/Monsters/Arachnid/Melee/TerathanWarrior.cs b/Scripts/Mobiles/Monsters/Arachnid/Melee/TerathanWarrior.cs index 09529d34d..0ab3448ca 100644 --- a/Scripts/Mobiles/Monsters/Arachnid/Melee/TerathanWarrior.cs +++ b/Scripts/Mobiles/Monsters/Arachnid/Melee/TerathanWarrior.cs @@ -52,8 +52,8 @@ namespace Server.Mobiles AddLoot( LootPack.Average ); } - public override int TreasureMapLevel{ get{ return 1; } } - public override int Meat{ get{ return 4; } } + public override int TreasureMapLevel => 1; + public override int Meat => 4; public override OppositionGroup OppositionGroup { diff --git a/Scripts/Mobiles/Monsters/Elemental/Magic/AcidElemental.cs b/Scripts/Mobiles/Monsters/Elemental/Magic/AcidElemental.cs index 0942279bb..09da069a7 100644 --- a/Scripts/Mobiles/Monsters/Elemental/Magic/AcidElemental.cs +++ b/Scripts/Mobiles/Monsters/Elemental/Magic/AcidElemental.cs @@ -55,9 +55,9 @@ namespace Server.Mobiles public override bool BleedImmune => true; public override Poison HitPoison => Poison.Lethal; - public override double HitPoisonChance{ get{ return 0.6; } } + public override double HitPoisonChance => 0.6; - public override int TreasureMapLevel{ get{ return Core.AOS ? 2 : 3; } } + public override int TreasureMapLevel => Core.AOS ? 2 : 3; public AcidElemental( Serial serial ) : base( serial ) diff --git a/Scripts/Mobiles/Monsters/Elemental/Magic/AirElemental.cs b/Scripts/Mobiles/Monsters/Elemental/Magic/AirElemental.cs index fb551c30d..d279ae50e 100644 --- a/Scripts/Mobiles/Monsters/Elemental/Magic/AirElemental.cs +++ b/Scripts/Mobiles/Monsters/Elemental/Magic/AirElemental.cs @@ -7,8 +7,8 @@ namespace Server.Mobiles [CorpseName( "an air elemental corpse" )] public class AirElemental : BaseCreature { - public override double DispelDifficulty{ get{ return 117.5; } } - public override double DispelFocus{ get{ return 45.0; } } + public override double DispelDifficulty => 117.5; + public override double DispelFocus => 45.0; public override string DefaultName => "an air elemental"; @@ -59,7 +59,7 @@ namespace Server.Mobiles } public override bool BleedImmune => true; - public override int TreasureMapLevel{ get{ return 2; } } + public override int TreasureMapLevel => 2; public AirElemental( Serial serial ) : base( serial ) { diff --git a/Scripts/Mobiles/Monsters/Elemental/Magic/BloodElemental.cs b/Scripts/Mobiles/Monsters/Elemental/Magic/BloodElemental.cs index d6ec96fb2..533471d5a 100644 --- a/Scripts/Mobiles/Monsters/Elemental/Magic/BloodElemental.cs +++ b/Scripts/Mobiles/Monsters/Elemental/Magic/BloodElemental.cs @@ -52,7 +52,7 @@ namespace Server.Mobiles AddLoot( LootPack.Rich ); } - public override int TreasureMapLevel{ get{ return 5; } } + public override int TreasureMapLevel => 5; public BloodElemental( Serial serial ) : base( serial ) { diff --git a/Scripts/Mobiles/Monsters/Elemental/Magic/Efreet.cs b/Scripts/Mobiles/Monsters/Elemental/Magic/Efreet.cs index cba094834..c404f868f 100644 --- a/Scripts/Mobiles/Monsters/Elemental/Magic/Efreet.cs +++ b/Scripts/Mobiles/Monsters/Elemental/Magic/Efreet.cs @@ -63,7 +63,7 @@ namespace Server.Mobiles } } - public override int TreasureMapLevel{ get{ return Core.AOS ? 4 : 5; } } + public override int TreasureMapLevel => Core.AOS ? 4 : 5; public Efreet( Serial serial ) : base( serial ) { diff --git a/Scripts/Mobiles/Monsters/Elemental/Magic/FireElemental.cs b/Scripts/Mobiles/Monsters/Elemental/Magic/FireElemental.cs index c75d869a5..63989eb40 100644 --- a/Scripts/Mobiles/Monsters/Elemental/Magic/FireElemental.cs +++ b/Scripts/Mobiles/Monsters/Elemental/Magic/FireElemental.cs @@ -7,8 +7,8 @@ namespace Server.Mobiles [CorpseName( "a fire elemental corpse" )] public class FireElemental : BaseCreature { - public override double DispelDifficulty{ get{ return 117.5; } } - public override double DispelFocus{ get{ return 45.0; } } + public override double DispelDifficulty => 117.5; + public override double DispelFocus => 45.0; public override string DefaultName => "a fire elemental"; @@ -60,7 +60,7 @@ namespace Server.Mobiles } public override bool BleedImmune => true; - public override int TreasureMapLevel{ get{ return 2; } } + public override int TreasureMapLevel => 2; public FireElemental( Serial serial ) : base( serial ) { diff --git a/Scripts/Mobiles/Monsters/Elemental/Magic/PoisonElemental.cs b/Scripts/Mobiles/Monsters/Elemental/Magic/PoisonElemental.cs index 6aa99b2c5..b4e50ec8a 100644 --- a/Scripts/Mobiles/Monsters/Elemental/Magic/PoisonElemental.cs +++ b/Scripts/Mobiles/Monsters/Elemental/Magic/PoisonElemental.cs @@ -60,9 +60,9 @@ namespace Server.Mobiles public override Poison PoisonImmune => Poison.Lethal; public override Poison HitPoison => Poison.Lethal; - public override double HitPoisonChance{ get{ return 0.75; } } + public override double HitPoisonChance => 0.75; - public override int TreasureMapLevel{ get{ return 5; } } + public override int TreasureMapLevel => 5; public PoisonElemental( Serial serial ) : base( serial ) { diff --git a/Scripts/Mobiles/Monsters/Elemental/Magic/WaterElemental.cs b/Scripts/Mobiles/Monsters/Elemental/Magic/WaterElemental.cs index f5be5a6d3..d790526f5 100644 --- a/Scripts/Mobiles/Monsters/Elemental/Magic/WaterElemental.cs +++ b/Scripts/Mobiles/Monsters/Elemental/Magic/WaterElemental.cs @@ -7,8 +7,8 @@ namespace Server.Mobiles [CorpseName( "a water elemental corpse" )] public class WaterElemental : BaseCreature { - public override double DispelDifficulty{ get{ return 117.5; } } - public override double DispelFocus{ get{ return 45.0; } } + public override double DispelDifficulty => 117.5; + public override double DispelFocus => 45.0; public override string DefaultName => "a water elemental"; @@ -58,7 +58,7 @@ namespace Server.Mobiles } public override bool BleedImmune => true; - public override int TreasureMapLevel{ get{ return 2; } } + public override int TreasureMapLevel => 2; public WaterElemental( Serial serial ) : base( serial ) { diff --git a/Scripts/Mobiles/Monsters/Elemental/Melee/EarthElemental.cs b/Scripts/Mobiles/Monsters/Elemental/Melee/EarthElemental.cs index 9f841ebe8..386078b96 100644 --- a/Scripts/Mobiles/Monsters/Elemental/Melee/EarthElemental.cs +++ b/Scripts/Mobiles/Monsters/Elemental/Melee/EarthElemental.cs @@ -8,8 +8,8 @@ namespace Server.Mobiles [CorpseName( "an earth elemental corpse" )] public class EarthElemental : BaseCreature { - public override double DispelDifficulty{ get{ return 117.5; } } - public override double DispelFocus{ get{ return 45.0; } } + public override double DispelDifficulty => 117.5; + public override double DispelFocus => 45.0; public override string DefaultName => "an earth elemental"; @@ -61,7 +61,7 @@ namespace Server.Mobiles } public override bool BleedImmune => true; - public override int TreasureMapLevel{ get{ return 1; } } + public override int TreasureMapLevel => 1; public EarthElemental( Serial serial ) : base( serial ) { diff --git a/Scripts/Mobiles/Monsters/Elemental/Melee/SnowElemental.cs b/Scripts/Mobiles/Monsters/Elemental/Melee/SnowElemental.cs index 7e5c44e61..66f754a02 100644 --- a/Scripts/Mobiles/Monsters/Elemental/Melee/SnowElemental.cs +++ b/Scripts/Mobiles/Monsters/Elemental/Melee/SnowElemental.cs @@ -53,7 +53,7 @@ namespace Server.Mobiles public override bool BleedImmune => true; - public override int TreasureMapLevel{ get{ return Utility.RandomList( 2, 3 ); } } + public override int TreasureMapLevel => Utility.RandomList( 2, 3 ); public SnowElemental( Serial serial ) : base( serial ) { diff --git a/Scripts/Mobiles/Monsters/Humanoid/Magic/AncientLich.cs b/Scripts/Mobiles/Monsters/Humanoid/Magic/AncientLich.cs index b89b31695..add3dd7dd 100644 --- a/Scripts/Mobiles/Monsters/Humanoid/Magic/AncientLich.cs +++ b/Scripts/Mobiles/Monsters/Humanoid/Magic/AncientLich.cs @@ -89,7 +89,7 @@ namespace Server.Mobiles public override bool Unprovokable => true; public override bool BleedImmune => true; public override Poison PoisonImmune => Poison.Lethal; - public override int TreasureMapLevel{ get{ return 5; } } + public override int TreasureMapLevel => 5; public AncientLich( Serial serial ) : base( serial ) { diff --git a/Scripts/Mobiles/Monsters/Humanoid/Magic/Balron.cs b/Scripts/Mobiles/Monsters/Humanoid/Magic/Balron.cs index c4ea56840..33db8e829 100644 --- a/Scripts/Mobiles/Monsters/Humanoid/Magic/Balron.cs +++ b/Scripts/Mobiles/Monsters/Humanoid/Magic/Balron.cs @@ -57,8 +57,8 @@ namespace Server.Mobiles public override bool CanRummageCorpses => true; public override Poison PoisonImmune => Poison.Deadly; - public override int TreasureMapLevel{ get{ return 5; } } - public override int Meat{ get{ return 1; } } + public override int TreasureMapLevel => 5; + public override int Meat => 1; public Balron( Serial serial ) : base( serial ) { diff --git a/Scripts/Mobiles/Monsters/Humanoid/Magic/Betrayer.cs b/Scripts/Mobiles/Monsters/Humanoid/Magic/Betrayer.cs index e9029e276..37ef43a11 100644 --- a/Scripts/Mobiles/Monsters/Humanoid/Magic/Betrayer.cs +++ b/Scripts/Mobiles/Monsters/Humanoid/Magic/Betrayer.cs @@ -99,8 +99,8 @@ namespace Server.Mobiles public override bool AlwaysMurderer => true; public override bool BardImmune => !Core.AOS; public override Poison PoisonImmune => Poison.Lethal; - public override int Meat{ get{ return 1; } } - public override int TreasureMapLevel{ get{ return 5; } } + public override int Meat => 1; + public override int TreasureMapLevel => 5; public override void OnGaveMeleeAttack( Mobile defender ) { diff --git a/Scripts/Mobiles/Monsters/Humanoid/Magic/Daemon.cs b/Scripts/Mobiles/Monsters/Humanoid/Magic/Daemon.cs index 74f0b02c1..7fbac637d 100644 --- a/Scripts/Mobiles/Monsters/Humanoid/Magic/Daemon.cs +++ b/Scripts/Mobiles/Monsters/Humanoid/Magic/Daemon.cs @@ -8,11 +8,11 @@ namespace Server.Mobiles [CorpseName( "a daemon corpse" )] public class Daemon : BaseCreature { - public override double DispelDifficulty{ get{ return 125.0; } } - public override double DispelFocus{ get{ return 45.0; } } + public override double DispelDifficulty => 125.0; + public override double DispelFocus => 45.0; - public override Faction FactionAllegiance { get { return Shadowlords.Instance; } } - public override Ethics.Ethic EthicAllegiance { get { return Ethics.Ethic.Evil; } } + public override Faction FactionAllegiance => Shadowlords.Instance; + public override Ethics.Ethic EthicAllegiance => Ethics.Ethic.Evil; [Constructible] public Daemon () : base( AIType.AI_Mage, FightMode.Closest, 10, 1, 0.2, 0.4 ) @@ -59,8 +59,8 @@ namespace Server.Mobiles public override bool CanRummageCorpses => true; public override Poison PoisonImmune => Poison.Regular; - public override int TreasureMapLevel{ get{ return 4; } } - public override int Meat{ get{ return 1; } } + public override int TreasureMapLevel => 4; + public override int Meat => 1; public override bool CanFly => true; public Daemon( Serial serial ) : base( serial ) diff --git a/Scripts/Mobiles/Monsters/Humanoid/Magic/ElderGazer.cs b/Scripts/Mobiles/Monsters/Humanoid/Magic/ElderGazer.cs index 807dfd550..5bf2e1657 100644 --- a/Scripts/Mobiles/Monsters/Humanoid/Magic/ElderGazer.cs +++ b/Scripts/Mobiles/Monsters/Humanoid/Magic/ElderGazer.cs @@ -45,7 +45,7 @@ namespace Server.Mobiles VirtualArmor = 50; } - public override int TreasureMapLevel{ get{ return Core.AOS ? 4 : 0; } } + public override int TreasureMapLevel => Core.AOS ? 4 : 0; public override void GenerateLoot() { diff --git a/Scripts/Mobiles/Monsters/Humanoid/Magic/EvilMage.cs b/Scripts/Mobiles/Monsters/Humanoid/Magic/EvilMage.cs index ba151b9bf..84d498fdf 100644 --- a/Scripts/Mobiles/Monsters/Humanoid/Magic/EvilMage.cs +++ b/Scripts/Mobiles/Monsters/Humanoid/Magic/EvilMage.cs @@ -53,8 +53,8 @@ namespace Server.Mobiles public override bool CanRummageCorpses => true; public override bool AlwaysMurderer => true; - public override int Meat{ get{ return 1; } } - public override int TreasureMapLevel{ get{ return Core.AOS ? 1 : 0; } } + public override int Meat => 1; + public override int TreasureMapLevel => Core.AOS ? 1 : 0; public EvilMage( Serial serial ) : base( serial ) { diff --git a/Scripts/Mobiles/Monsters/Humanoid/Magic/EvilMageLord.cs b/Scripts/Mobiles/Monsters/Humanoid/Magic/EvilMageLord.cs index 8cff8460f..5d32fe3a5 100644 --- a/Scripts/Mobiles/Monsters/Humanoid/Magic/EvilMageLord.cs +++ b/Scripts/Mobiles/Monsters/Humanoid/Magic/EvilMageLord.cs @@ -59,8 +59,8 @@ namespace Server.Mobiles public override bool CanRummageCorpses => true; public override bool AlwaysMurderer => true; - public override int Meat{ get{ return 1; } } - public override int TreasureMapLevel{ get{ return Core.AOS ? 2 : 0; } } + public override int Meat => 1; + public override int TreasureMapLevel => Core.AOS ? 2 : 0; public EvilMageLord( Serial serial ) : base( serial ) { diff --git a/Scripts/Mobiles/Monsters/Humanoid/Magic/FireGargoyle.cs b/Scripts/Mobiles/Monsters/Humanoid/Magic/FireGargoyle.cs index 553083c2a..74054f8c7 100644 --- a/Scripts/Mobiles/Monsters/Humanoid/Magic/FireGargoyle.cs +++ b/Scripts/Mobiles/Monsters/Humanoid/Magic/FireGargoyle.cs @@ -51,8 +51,8 @@ namespace Server.Mobiles } public override bool HasBreath => true; // fire breath enabled - public override int TreasureMapLevel{ get{ return 1; } } - public override int Meat{ get{ return 1; } } + public override int TreasureMapLevel => 1; + public override int Meat => 1; public override bool CanFly => true; public FireGargoyle( Serial serial ) : base( serial ) diff --git a/Scripts/Mobiles/Monsters/Humanoid/Magic/Gargoyle.cs b/Scripts/Mobiles/Monsters/Humanoid/Magic/Gargoyle.cs index 9fba3486e..4debd09bf 100644 --- a/Scripts/Mobiles/Monsters/Humanoid/Magic/Gargoyle.cs +++ b/Scripts/Mobiles/Monsters/Humanoid/Magic/Gargoyle.cs @@ -54,8 +54,8 @@ namespace Server.Mobiles AddLoot( LootPack.Gems, Utility.RandomMinMax( 1, 4 ) ); } - public override int TreasureMapLevel{ get{ return 1; } } - public override int Meat{ get{ return 1; } } + public override int TreasureMapLevel => 1; + public override int Meat => 1; public Gargoyle( Serial serial ) : base( serial ) { diff --git a/Scripts/Mobiles/Monsters/Humanoid/Magic/GargoyleDestroyer.cs b/Scripts/Mobiles/Monsters/Humanoid/Magic/GargoyleDestroyer.cs index cf28fa8ab..f07315419 100644 --- a/Scripts/Mobiles/Monsters/Humanoid/Magic/GargoyleDestroyer.cs +++ b/Scripts/Mobiles/Monsters/Humanoid/Magic/GargoyleDestroyer.cs @@ -57,7 +57,7 @@ namespace Server.Mobiles } public override bool BardImmune => !Core.AOS; - public override int Meat{ get{ return 1; } } + public override int Meat => 1; public override bool CanFly => true; public override void OnDamagedBySpell( Mobile from ) diff --git a/Scripts/Mobiles/Monsters/Humanoid/Magic/GargoyleEnforcer.cs b/Scripts/Mobiles/Monsters/Humanoid/Magic/GargoyleEnforcer.cs index 42b598d5c..4a6f92104 100644 --- a/Scripts/Mobiles/Monsters/Humanoid/Magic/GargoyleEnforcer.cs +++ b/Scripts/Mobiles/Monsters/Humanoid/Magic/GargoyleEnforcer.cs @@ -56,7 +56,7 @@ namespace Server.Mobiles AddLoot( LootPack.MedScrolls ); } - public override int Meat{ get{ return 1; } } + public override int Meat => 1; public GargoyleEnforcer( Serial serial ) : base( serial ) { diff --git a/Scripts/Mobiles/Monsters/Humanoid/Magic/Gazer.cs b/Scripts/Mobiles/Monsters/Humanoid/Magic/Gazer.cs index 12e00246d..1e6301ad1 100644 --- a/Scripts/Mobiles/Monsters/Humanoid/Magic/Gazer.cs +++ b/Scripts/Mobiles/Monsters/Humanoid/Magic/Gazer.cs @@ -51,8 +51,8 @@ namespace Server.Mobiles AddLoot( LootPack.Potions ); } - public override int TreasureMapLevel{ get{ return 1; } } - public override int Meat{ get{ return 1; } } + public override int TreasureMapLevel => 1; + public override int Meat => 1; public Gazer( Serial serial ) : base( serial ) { diff --git a/Scripts/Mobiles/Monsters/Humanoid/Magic/IceFiend.cs b/Scripts/Mobiles/Monsters/Humanoid/Magic/IceFiend.cs index 903a2e91b..74841df7f 100644 --- a/Scripts/Mobiles/Monsters/Humanoid/Magic/IceFiend.cs +++ b/Scripts/Mobiles/Monsters/Humanoid/Magic/IceFiend.cs @@ -48,8 +48,8 @@ namespace Server.Mobiles AddLoot( LootPack.MedScrolls, 2 ); } - public override int TreasureMapLevel{ get{ return 4; } } - public override int Meat{ get{ return 1; } } + public override int TreasureMapLevel => 4; + public override int Meat => 1; public override bool CanFly => true; public IceFiend( Serial serial ) : base( serial ) diff --git a/Scripts/Mobiles/Monsters/Humanoid/Magic/Imp.cs b/Scripts/Mobiles/Monsters/Humanoid/Magic/Imp.cs index c236a97bc..46179661b 100644 --- a/Scripts/Mobiles/Monsters/Humanoid/Magic/Imp.cs +++ b/Scripts/Mobiles/Monsters/Humanoid/Magic/Imp.cs @@ -55,11 +55,11 @@ namespace Server.Mobiles AddLoot( LootPack.MedScrolls, 2 ); } - public override int Meat{ get{ return 1; } } - public override int Hides{ get{ return 6; } } - public override HideType HideType{ get{ return HideType.Spined; } } - public override FoodType FavoriteFood{ get{ return FoodType.Meat; } } - public override PackInstinct PackInstinct{ get{ return PackInstinct.Daemon; } } + public override int Meat => 1; + public override int Hides => 6; + public override HideType HideType => HideType.Spined; + public override FoodType FavoriteFood => FoodType.Meat; + public override PackInstinct PackInstinct => PackInstinct.Daemon; public override bool CanFly => true; public Imp( Serial serial ) : base( serial ) diff --git a/Scripts/Mobiles/Monsters/Humanoid/Magic/Lich.cs b/Scripts/Mobiles/Monsters/Humanoid/Magic/Lich.cs index b67918907..02f31e202 100644 --- a/Scripts/Mobiles/Monsters/Humanoid/Magic/Lich.cs +++ b/Scripts/Mobiles/Monsters/Humanoid/Magic/Lich.cs @@ -65,7 +65,7 @@ namespace Server.Mobiles public override bool CanRummageCorpses => true; public override bool BleedImmune => true; public override Poison PoisonImmune => Poison.Lethal; - public override int TreasureMapLevel{ get{ return 3; } } + public override int TreasureMapLevel => 3; public Lich( Serial serial ) : base( serial ) { diff --git a/Scripts/Mobiles/Monsters/Humanoid/Magic/LichLord.cs b/Scripts/Mobiles/Monsters/Humanoid/Magic/LichLord.cs index 62c90ec67..572f17665 100644 --- a/Scripts/Mobiles/Monsters/Humanoid/Magic/LichLord.cs +++ b/Scripts/Mobiles/Monsters/Humanoid/Magic/LichLord.cs @@ -64,7 +64,7 @@ namespace Server.Mobiles public override bool CanRummageCorpses => true; public override bool BleedImmune => true; public override Poison PoisonImmune => Poison.Lethal; - public override int TreasureMapLevel{ get{ return 4; } } + public override int TreasureMapLevel => 4; public LichLord( Serial serial ) : base( serial ) { diff --git a/Scripts/Mobiles/Monsters/Humanoid/Magic/OrcishMage.cs b/Scripts/Mobiles/Monsters/Humanoid/Magic/OrcishMage.cs index 88c840c80..1637b0522 100644 --- a/Scripts/Mobiles/Monsters/Humanoid/Magic/OrcishMage.cs +++ b/Scripts/Mobiles/Monsters/Humanoid/Magic/OrcishMage.cs @@ -8,7 +8,7 @@ namespace Server.Mobiles [CorpseName( "a glowing orc corpse" )] public class OrcishMage : BaseCreature { - public override InhumanSpeech SpeechType{ get{ return InhumanSpeech.Orc; } } + public override InhumanSpeech SpeechType => InhumanSpeech.Orc; public override string DefaultName => "an orcish mage"; @@ -59,8 +59,8 @@ namespace Server.Mobiles } public override bool CanRummageCorpses => true; - public override int TreasureMapLevel{ get{ return 1; } } - public override int Meat{ get{ return 1; } } + public override int TreasureMapLevel => 1; + public override int Meat => 1; public override OppositionGroup OppositionGroup { diff --git a/Scripts/Mobiles/Monsters/Humanoid/Magic/RatmanMage.cs b/Scripts/Mobiles/Monsters/Humanoid/Magic/RatmanMage.cs index 751fa4f6d..123b2f611 100644 --- a/Scripts/Mobiles/Monsters/Humanoid/Magic/RatmanMage.cs +++ b/Scripts/Mobiles/Monsters/Humanoid/Magic/RatmanMage.cs @@ -9,7 +9,7 @@ namespace Server.Mobiles [CorpseName( "a glowing ratman corpse" )] public class RatmanMage : BaseCreature { - public override InhumanSpeech SpeechType{ get{ return InhumanSpeech.Ratman; } } + public override InhumanSpeech SpeechType => InhumanSpeech.Ratman; [Constructible] public RatmanMage() : base( AIType.AI_Mage, FightMode.Closest, 10, 1, 0.2, 0.4 ) @@ -58,9 +58,9 @@ namespace Server.Mobiles } public override bool CanRummageCorpses => true; - public override int Meat{ get{ return 1; } } - public override int Hides{ get{ return 8; } } - public override HideType HideType{ get{ return HideType.Spined; } } + public override int Meat => 1; + public override int Hides => 8; + public override HideType HideType => HideType.Spined; public RatmanMage( Serial serial ) : base( serial ) { diff --git a/Scripts/Mobiles/Monsters/Humanoid/Magic/SavageShaman.cs b/Scripts/Mobiles/Monsters/Humanoid/Magic/SavageShaman.cs index 50ffd3a4f..db22e2fa4 100644 --- a/Scripts/Mobiles/Monsters/Humanoid/Magic/SavageShaman.cs +++ b/Scripts/Mobiles/Monsters/Humanoid/Magic/SavageShaman.cs @@ -64,7 +64,7 @@ namespace Server.Mobiles } - public override int Meat{ get{ return 1; } } + public override int Meat => 1; public override bool AlwaysMurderer => true; public override bool ShowFameTitle => false; diff --git a/Scripts/Mobiles/Monsters/Humanoid/Magic/Succubus.cs b/Scripts/Mobiles/Monsters/Humanoid/Magic/Succubus.cs index e96cfa43f..84f8e2440 100644 --- a/Scripts/Mobiles/Monsters/Humanoid/Magic/Succubus.cs +++ b/Scripts/Mobiles/Monsters/Humanoid/Magic/Succubus.cs @@ -52,8 +52,8 @@ namespace Server.Mobiles AddLoot( LootPack.MedScrolls, 2 ); } - public override int Meat{ get{ return 1; } } - public override int TreasureMapLevel{ get{ return 5; } } + public override int Meat => 1; + public override int TreasureMapLevel => 5; public void DrainLife() { diff --git a/Scripts/Mobiles/Monsters/Humanoid/Magic/Titan.cs b/Scripts/Mobiles/Monsters/Humanoid/Magic/Titan.cs index 8b4168b6f..15a055e11 100644 --- a/Scripts/Mobiles/Monsters/Humanoid/Magic/Titan.cs +++ b/Scripts/Mobiles/Monsters/Humanoid/Magic/Titan.cs @@ -53,9 +53,9 @@ namespace Server.Mobiles AddLoot( LootPack.MedScrolls ); } - public override int Meat{ get{ return 4; } } + public override int Meat => 4; public override Poison PoisonImmune => Poison.Regular; - public override int TreasureMapLevel{ get{ return 5; } } + public override int TreasureMapLevel => 5; public Titan( Serial serial ) : base( serial ) { diff --git a/Scripts/Mobiles/Monsters/Humanoid/Melee/ArcticOgreLord.cs b/Scripts/Mobiles/Monsters/Humanoid/Melee/ArcticOgreLord.cs index db4dc62f9..7d1606d47 100644 --- a/Scripts/Mobiles/Monsters/Humanoid/Melee/ArcticOgreLord.cs +++ b/Scripts/Mobiles/Monsters/Humanoid/Melee/ArcticOgreLord.cs @@ -52,7 +52,7 @@ namespace Server.Mobiles } public override Poison PoisonImmune => Poison.Regular; - public override int TreasureMapLevel{ get{ return 3; } } + public override int TreasureMapLevel => 3; public ArcticOgreLord( Serial serial ) : base( serial ) { diff --git a/Scripts/Mobiles/Monsters/Humanoid/Melee/Cyclops.cs b/Scripts/Mobiles/Monsters/Humanoid/Melee/Cyclops.cs index 30d8b6b28..54765e43e 100644 --- a/Scripts/Mobiles/Monsters/Humanoid/Melee/Cyclops.cs +++ b/Scripts/Mobiles/Monsters/Humanoid/Melee/Cyclops.cs @@ -49,8 +49,8 @@ namespace Server.Mobiles AddLoot( LootPack.Average ); } - public override int Meat{ get{ return 4; } } - public override int TreasureMapLevel{ get{ return 3; } } + public override int Meat => 4; + public override int TreasureMapLevel => 3; public Cyclops( Serial serial ) : base( serial ) { diff --git a/Scripts/Mobiles/Monsters/Humanoid/Melee/Doppleganger.cs b/Scripts/Mobiles/Monsters/Humanoid/Melee/Doppleganger.cs index da1df8afb..c1e2b6f25 100644 --- a/Scripts/Mobiles/Monsters/Humanoid/Melee/Doppleganger.cs +++ b/Scripts/Mobiles/Monsters/Humanoid/Melee/Doppleganger.cs @@ -43,8 +43,8 @@ namespace Server.Mobiles AddLoot( LootPack.Average ); } - public override int Hides{ get{ return 6; } } - public override int Meat{ get{ return 1; } } + public override int Hides => 6; + public override int Meat => 1; public Doppleganger( Serial serial ) : base( serial ) { diff --git a/Scripts/Mobiles/Monsters/Humanoid/Melee/EnslavedGargoyle.cs b/Scripts/Mobiles/Monsters/Humanoid/Melee/EnslavedGargoyle.cs index ab6c3396d..a038d5247 100644 --- a/Scripts/Mobiles/Monsters/Humanoid/Melee/EnslavedGargoyle.cs +++ b/Scripts/Mobiles/Monsters/Humanoid/Melee/EnslavedGargoyle.cs @@ -47,8 +47,8 @@ namespace Server.Mobiles AddLoot( LootPack.Gems ); } - public override int Meat{ get{ return 1; } } - public override int TreasureMapLevel{ get{ return 1; } } + public override int Meat => 1; + public override int TreasureMapLevel => 1; public EnslavedGargoyle( Serial serial ) : base( serial ) { diff --git a/Scripts/Mobiles/Monsters/Humanoid/Melee/Ettin.cs b/Scripts/Mobiles/Monsters/Humanoid/Melee/Ettin.cs index 939d202c3..a81348d0e 100644 --- a/Scripts/Mobiles/Monsters/Humanoid/Melee/Ettin.cs +++ b/Scripts/Mobiles/Monsters/Humanoid/Melee/Ettin.cs @@ -50,8 +50,8 @@ namespace Server.Mobiles } public override bool CanRummageCorpses => true; - public override int TreasureMapLevel{ get{ return 1; } } - public override int Meat{ get{ return 4; } } + public override int TreasureMapLevel => 1; + public override int Meat => 4; public Ettin( Serial serial ) : base( serial ) { diff --git a/Scripts/Mobiles/Monsters/Humanoid/Melee/FrostTroll.cs b/Scripts/Mobiles/Monsters/Humanoid/Melee/FrostTroll.cs index 6039e8234..6e30a084d 100644 --- a/Scripts/Mobiles/Monsters/Humanoid/Melee/FrostTroll.cs +++ b/Scripts/Mobiles/Monsters/Humanoid/Melee/FrostTroll.cs @@ -50,8 +50,8 @@ namespace Server.Mobiles AddLoot( LootPack.Gems ); } - public override int Meat{ get{ return 2; } } - public override int TreasureMapLevel{ get{ return 1; } } + public override int Meat => 2; + public override int TreasureMapLevel => 1; public FrostTroll( Serial serial ) : base( serial ) { diff --git a/Scripts/Mobiles/Monsters/Humanoid/Melee/GazerLarva.cs b/Scripts/Mobiles/Monsters/Humanoid/Melee/GazerLarva.cs index 2125f844c..62de9e32a 100644 --- a/Scripts/Mobiles/Monsters/Humanoid/Melee/GazerLarva.cs +++ b/Scripts/Mobiles/Monsters/Humanoid/Melee/GazerLarva.cs @@ -44,7 +44,7 @@ namespace Server.Mobiles AddLoot( LootPack.Poor ); } - public override int Meat{ get{ return 1; } } + public override int Meat => 1; public GazerLarva( Serial serial ) : base( serial ) { diff --git a/Scripts/Mobiles/Monsters/Humanoid/Melee/GreaterMongbat.cs b/Scripts/Mobiles/Monsters/Humanoid/Melee/GreaterMongbat.cs index 833eae583..8f28d9f97 100644 --- a/Scripts/Mobiles/Monsters/Humanoid/Melee/GreaterMongbat.cs +++ b/Scripts/Mobiles/Monsters/Humanoid/Melee/GreaterMongbat.cs @@ -49,9 +49,9 @@ namespace Server.Mobiles AddLoot( LootPack.Poor ); } - public override int Meat{ get{ return 1; } } - public override int Hides{ get{ return 6; } } - public override FoodType FavoriteFood{ get{ return FoodType.Meat; } } + public override int Meat => 1; + public override int Hides => 6; + public override FoodType FavoriteFood => FoodType.Meat; public GreaterMongbat( Serial serial ) : base( serial ) { diff --git a/Scripts/Mobiles/Monsters/Humanoid/Melee/HeadlessOne.cs b/Scripts/Mobiles/Monsters/Humanoid/Melee/HeadlessOne.cs index 3681e073d..5f33d477f 100644 --- a/Scripts/Mobiles/Monsters/Humanoid/Melee/HeadlessOne.cs +++ b/Scripts/Mobiles/Monsters/Humanoid/Melee/HeadlessOne.cs @@ -46,7 +46,7 @@ namespace Server.Mobiles } public override bool CanRummageCorpses => true; - public override int Meat{ get{ return 1; } } + public override int Meat => 1; public HeadlessOne( Serial serial ) : base( serial ) { diff --git a/Scripts/Mobiles/Monsters/Humanoid/Melee/Juggernaut.cs b/Scripts/Mobiles/Monsters/Humanoid/Melee/Juggernaut.cs index 18cd1ed92..e6dcb18e6 100644 --- a/Scripts/Mobiles/Monsters/Humanoid/Melee/Juggernaut.cs +++ b/Scripts/Mobiles/Monsters/Humanoid/Melee/Juggernaut.cs @@ -97,8 +97,8 @@ namespace Server.Mobiles public override bool BardImmune => !Core.AOS; public override bool BleedImmune => true; public override Poison PoisonImmune => Poison.Lethal; - public override int Meat{ get{ return 1; } } - public override int TreasureMapLevel{ get{ return 5; } } + public override int Meat => 1; + public override int TreasureMapLevel => 5; public override void OnGaveMeleeAttack( Mobile defender ) { diff --git a/Scripts/Mobiles/Monsters/Humanoid/Melee/KhaldunRevenant.cs b/Scripts/Mobiles/Monsters/Humanoid/Melee/KhaldunRevenant.cs index 777bb4f95..d8ae5814a 100644 --- a/Scripts/Mobiles/Monsters/Humanoid/Melee/KhaldunRevenant.cs +++ b/Scripts/Mobiles/Monsters/Humanoid/Melee/KhaldunRevenant.cs @@ -62,7 +62,7 @@ namespace Server.Mobiles { } - public override Mobile ConstantFocus{ get{ return m_Target; } } + public override Mobile ConstantFocus => m_Target; public override bool AlwaysAttackable => true; public override string DefaultName => "a revenant"; diff --git a/Scripts/Mobiles/Monsters/Humanoid/Melee/Mongbat.cs b/Scripts/Mobiles/Monsters/Humanoid/Melee/Mongbat.cs index 8a018f5b6..84bf3d268 100644 --- a/Scripts/Mobiles/Monsters/Humanoid/Melee/Mongbat.cs +++ b/Scripts/Mobiles/Monsters/Humanoid/Melee/Mongbat.cs @@ -50,8 +50,8 @@ namespace Server.Mobiles AddLoot( LootPack.Poor ); } - public override int Meat{ get{ return 1; } } - public override FoodType FavoriteFood{ get{ return FoodType.Meat; } } + public override int Meat => 1; + public override FoodType FavoriteFood => FoodType.Meat; public Mongbat( Serial serial ) : base( serial ) { diff --git a/Scripts/Mobiles/Monsters/Humanoid/Melee/Ogre.cs b/Scripts/Mobiles/Monsters/Humanoid/Melee/Ogre.cs index fbf76ae5d..effc99278 100644 --- a/Scripts/Mobiles/Monsters/Humanoid/Melee/Ogre.cs +++ b/Scripts/Mobiles/Monsters/Humanoid/Melee/Ogre.cs @@ -52,8 +52,8 @@ namespace Server.Mobiles } public override bool CanRummageCorpses => true; - public override int TreasureMapLevel{ get{ return 1; } } - public override int Meat{ get{ return 2; } } + public override int TreasureMapLevel => 1; + public override int Meat => 2; public Ogre( Serial serial ) : base( serial ) { diff --git a/Scripts/Mobiles/Monsters/Humanoid/Melee/OgreLord.cs b/Scripts/Mobiles/Monsters/Humanoid/Melee/OgreLord.cs index 41c6567a9..6723a2d0d 100644 --- a/Scripts/Mobiles/Monsters/Humanoid/Melee/OgreLord.cs +++ b/Scripts/Mobiles/Monsters/Humanoid/Melee/OgreLord.cs @@ -9,8 +9,8 @@ namespace Server.Mobiles [CorpseName( "an ogre lords corpse" )] public class OgreLord : BaseCreature { - public override Faction FactionAllegiance { get { return Minax.Instance; } } - public override Ethics.Ethic EthicAllegiance { get { return Ethics.Ethic.Evil; } } + public override Faction FactionAllegiance => Minax.Instance; + public override Ethics.Ethic EthicAllegiance => Ethics.Ethic.Evil; public override string DefaultName => "an ogre lord"; @@ -55,8 +55,8 @@ namespace Server.Mobiles public override bool CanRummageCorpses => true; public override Poison PoisonImmune => Poison.Regular; - public override int TreasureMapLevel{ get{ return 3; } } - public override int Meat{ get{ return 2; } } + public override int TreasureMapLevel => 3; + public override int Meat => 2; public OgreLord( Serial serial ) : base( serial ) { diff --git a/Scripts/Mobiles/Monsters/Humanoid/Melee/Orc.cs b/Scripts/Mobiles/Monsters/Humanoid/Melee/Orc.cs index d515a164e..a79c562cc 100644 --- a/Scripts/Mobiles/Monsters/Humanoid/Melee/Orc.cs +++ b/Scripts/Mobiles/Monsters/Humanoid/Melee/Orc.cs @@ -9,7 +9,7 @@ namespace Server.Mobiles [CorpseName( "an orcish corpse" )] public class Orc : BaseCreature { - public override InhumanSpeech SpeechType{ get{ return InhumanSpeech.Orc; } } + public override InhumanSpeech SpeechType => InhumanSpeech.Orc; [Constructible] public Orc() : base( AIType.AI_Melee, FightMode.Closest, 10, 1, 0.2, 0.4 ) @@ -72,8 +72,8 @@ namespace Server.Mobiles } public override bool CanRummageCorpses => true; - public override int TreasureMapLevel{ get{ return 1; } } - public override int Meat{ get{ return 1; } } + public override int TreasureMapLevel => 1; + public override int Meat => 1; public override OppositionGroup OppositionGroup { diff --git a/Scripts/Mobiles/Monsters/Humanoid/Melee/OrcBomber.cs b/Scripts/Mobiles/Monsters/Humanoid/Melee/OrcBomber.cs index 7575a2664..a87beaf5a 100644 --- a/Scripts/Mobiles/Monsters/Humanoid/Melee/OrcBomber.cs +++ b/Scripts/Mobiles/Monsters/Humanoid/Melee/OrcBomber.cs @@ -9,7 +9,7 @@ namespace Server.Mobiles [CorpseName( "an orcish corpse" )] public class OrcBomber : BaseCreature { - public override InhumanSpeech SpeechType{ get{ return InhumanSpeech.Orc; } } + public override InhumanSpeech SpeechType => InhumanSpeech.Orc; public override string DefaultName => "an orc bomber"; diff --git a/Scripts/Mobiles/Monsters/Humanoid/Melee/OrcBrute.cs b/Scripts/Mobiles/Monsters/Humanoid/Melee/OrcBrute.cs index 19ca8b376..0ddf3ebda 100644 --- a/Scripts/Mobiles/Monsters/Humanoid/Melee/OrcBrute.cs +++ b/Scripts/Mobiles/Monsters/Humanoid/Melee/OrcBrute.cs @@ -63,7 +63,7 @@ namespace Server.Mobiles public override bool BardImmune => !Core.AOS; public override Poison PoisonImmune => Poison.Lethal; - public override int Meat{ get{ return 2; } } + public override int Meat => 2; public override OppositionGroup OppositionGroup { diff --git a/Scripts/Mobiles/Monsters/Humanoid/Melee/OrcCaptain.cs b/Scripts/Mobiles/Monsters/Humanoid/Melee/OrcCaptain.cs index 2221da846..b7c6928df 100644 --- a/Scripts/Mobiles/Monsters/Humanoid/Melee/OrcCaptain.cs +++ b/Scripts/Mobiles/Monsters/Humanoid/Melee/OrcCaptain.cs @@ -9,7 +9,7 @@ namespace Server.Mobiles [CorpseName( "an orcish corpse" )] public class OrcCaptain : BaseCreature { - public override InhumanSpeech SpeechType{ get{ return InhumanSpeech.Orc; } } + public override InhumanSpeech SpeechType => InhumanSpeech.Orc; [Constructible] public OrcCaptain() : base( AIType.AI_Melee, FightMode.Closest, 10, 1, 0.2, 0.4 ) @@ -74,7 +74,7 @@ namespace Server.Mobiles } public override bool CanRummageCorpses => true; - public override int Meat{ get{ return 1; } } + public override int Meat => 1; public override OppositionGroup OppositionGroup { diff --git a/Scripts/Mobiles/Monsters/Humanoid/Melee/OrcishLord.cs b/Scripts/Mobiles/Monsters/Humanoid/Melee/OrcishLord.cs index 51fdc16ab..2e0a53c12 100644 --- a/Scripts/Mobiles/Monsters/Humanoid/Melee/OrcishLord.cs +++ b/Scripts/Mobiles/Monsters/Humanoid/Melee/OrcishLord.cs @@ -9,7 +9,7 @@ namespace Server.Mobiles [CorpseName( "an orcish corpse" )] public class OrcishLord : BaseCreature { - public override InhumanSpeech SpeechType{ get{ return InhumanSpeech.Orc; } } + public override InhumanSpeech SpeechType => InhumanSpeech.Orc; public override string DefaultName => "an orcish lord"; @@ -69,8 +69,8 @@ namespace Server.Mobiles } public override bool CanRummageCorpses => true; - public override int TreasureMapLevel{ get{ return 1; } } - public override int Meat{ get{ return 1; } } + public override int TreasureMapLevel => 1; + public override int Meat => 1; public override OppositionGroup OppositionGroup { diff --git a/Scripts/Mobiles/Monsters/Humanoid/Melee/Ratman.cs b/Scripts/Mobiles/Monsters/Humanoid/Melee/Ratman.cs index 2bfa9d83f..ce1efad6c 100644 --- a/Scripts/Mobiles/Monsters/Humanoid/Melee/Ratman.cs +++ b/Scripts/Mobiles/Monsters/Humanoid/Melee/Ratman.cs @@ -9,7 +9,7 @@ namespace Server.Mobiles [CorpseName( "a ratman's corpse" )] public class Ratman : BaseCreature { - public override InhumanSpeech SpeechType{ get{ return InhumanSpeech.Ratman; } } + public override InhumanSpeech SpeechType => InhumanSpeech.Ratman; [Constructible] public Ratman() : base( AIType.AI_Melee, FightMode.Closest, 10, 1, 0.2, 0.4 ) @@ -51,8 +51,8 @@ namespace Server.Mobiles } public override bool CanRummageCorpses => true; - public override int Hides{ get{ return 8; } } - public override HideType HideType{ get{ return HideType.Spined; } } + public override int Hides => 8; + public override HideType HideType => HideType.Spined; public Ratman( Serial serial ) : base( serial ) { diff --git a/Scripts/Mobiles/Monsters/Humanoid/Melee/RatmanArcher.cs b/Scripts/Mobiles/Monsters/Humanoid/Melee/RatmanArcher.cs index 7180574ff..fe648facf 100644 --- a/Scripts/Mobiles/Monsters/Humanoid/Melee/RatmanArcher.cs +++ b/Scripts/Mobiles/Monsters/Humanoid/Melee/RatmanArcher.cs @@ -9,7 +9,7 @@ namespace Server.Mobiles [CorpseName( "a ratman archer corpse" )] public class RatmanArcher : BaseCreature { - public override InhumanSpeech SpeechType{ get{ return InhumanSpeech.Ratman; } } + public override InhumanSpeech SpeechType => InhumanSpeech.Ratman; [Constructible] public RatmanArcher() : base( AIType.AI_Archer, FightMode.Closest, 10, 1, 0.2, 0.4 ) @@ -55,8 +55,8 @@ namespace Server.Mobiles } public override bool CanRummageCorpses => true; - public override int Hides{ get{ return 8; } } - public override HideType HideType{ get{ return HideType.Spined; } } + public override int Hides => 8; + public override HideType HideType => HideType.Spined; public RatmanArcher( Serial serial ) : base( serial ) { diff --git a/Scripts/Mobiles/Monsters/Humanoid/Melee/RottingCorpse.cs b/Scripts/Mobiles/Monsters/Humanoid/Melee/RottingCorpse.cs index 719358747..9d2b37560 100644 --- a/Scripts/Mobiles/Monsters/Humanoid/Melee/RottingCorpse.cs +++ b/Scripts/Mobiles/Monsters/Humanoid/Melee/RottingCorpse.cs @@ -55,7 +55,7 @@ namespace Server.Mobiles public override bool BleedImmune => true; public override Poison PoisonImmune => Poison.Lethal; public override Poison HitPoison => Poison.Lethal; - public override int TreasureMapLevel{ get{ return 5; } } + public override int TreasureMapLevel => 5; public RottingCorpse( Serial serial ) : base( serial ) { diff --git a/Scripts/Mobiles/Monsters/Humanoid/Melee/Savage.cs b/Scripts/Mobiles/Monsters/Humanoid/Melee/Savage.cs index 91ef90179..5c92f6d9d 100644 --- a/Scripts/Mobiles/Monsters/Humanoid/Melee/Savage.cs +++ b/Scripts/Mobiles/Monsters/Humanoid/Melee/Savage.cs @@ -58,7 +58,7 @@ namespace Server.Mobiles AddLoot( LootPack.Meager ); } - public override int Meat{ get{ return 1; } } + public override int Meat => 1; public override bool AlwaysMurderer => true; public override bool ShowFameTitle => false; diff --git a/Scripts/Mobiles/Monsters/Humanoid/Melee/SavageRider.cs b/Scripts/Mobiles/Monsters/Humanoid/Melee/SavageRider.cs index b2389c2a1..35c3b1ec9 100644 --- a/Scripts/Mobiles/Monsters/Humanoid/Melee/SavageRider.cs +++ b/Scripts/Mobiles/Monsters/Humanoid/Melee/SavageRider.cs @@ -55,7 +55,7 @@ namespace Server.Mobiles AddLoot( LootPack.Average ); } - public override int Meat{ get{ return 1; } } + public override int Meat => 1; public override bool AlwaysMurderer => true; public override bool ShowFameTitle => false; diff --git a/Scripts/Mobiles/Monsters/Humanoid/Melee/StoneGargoyle.cs b/Scripts/Mobiles/Monsters/Humanoid/Melee/StoneGargoyle.cs index 77e253842..5d6966946 100644 --- a/Scripts/Mobiles/Monsters/Humanoid/Melee/StoneGargoyle.cs +++ b/Scripts/Mobiles/Monsters/Humanoid/Melee/StoneGargoyle.cs @@ -54,7 +54,7 @@ namespace Server.Mobiles AddLoot( LootPack.Potions ); } - public override int TreasureMapLevel{ get{ return 2; } } + public override int TreasureMapLevel => 2; public StoneGargoyle( Serial serial ) : base( serial ) { diff --git a/Scripts/Mobiles/Monsters/Humanoid/Melee/StrongMongbat.cs b/Scripts/Mobiles/Monsters/Humanoid/Melee/StrongMongbat.cs index 414aca9cf..f3527fbdb 100644 --- a/Scripts/Mobiles/Monsters/Humanoid/Melee/StrongMongbat.cs +++ b/Scripts/Mobiles/Monsters/Humanoid/Melee/StrongMongbat.cs @@ -48,9 +48,9 @@ namespace Server.Mobiles AddLoot( LootPack.Poor ); } - public override int Meat{ get{ return 1; } } - public override int Hides{ get{ return 6; } } - public override FoodType FavoriteFood{ get{ return FoodType.Meat; } } + public override int Meat => 1; + public override int Hides => 6; + public override FoodType FavoriteFood => FoodType.Meat; public StrongMongbat( Serial serial ) : base( serial ) { diff --git a/Scripts/Mobiles/Monsters/Humanoid/Melee/Troll.cs b/Scripts/Mobiles/Monsters/Humanoid/Melee/Troll.cs index 2c94822a5..03329efad 100644 --- a/Scripts/Mobiles/Monsters/Humanoid/Melee/Troll.cs +++ b/Scripts/Mobiles/Monsters/Humanoid/Melee/Troll.cs @@ -48,8 +48,8 @@ namespace Server.Mobiles } public override bool CanRummageCorpses => true; - public override int TreasureMapLevel{ get{ return 1; } } - public override int Meat{ get{ return 2; } } + public override int TreasureMapLevel => 1; + public override int Meat => 2; public Troll( Serial serial ) : base( serial ) { diff --git a/Scripts/Mobiles/Monsters/LBR/Jukas/ChaosDragoonElite.cs b/Scripts/Mobiles/Monsters/LBR/Jukas/ChaosDragoonElite.cs index b06ad684d..6c217c38e 100644 --- a/Scripts/Mobiles/Monsters/LBR/Jukas/ChaosDragoonElite.cs +++ b/Scripts/Mobiles/Monsters/LBR/Jukas/ChaosDragoonElite.cs @@ -161,7 +161,7 @@ namespace Server.Mobiles public override bool HasBreath => true; public override bool AutoDispel => true; - public override bool BardImmune { get { return !Core.AOS; } } + public override bool BardImmune => !Core.AOS; public override bool CanRummageCorpses => true; public override bool AlwaysMurderer => true; public override bool ShowFameTitle => false; diff --git a/Scripts/Mobiles/Monsters/LBR/Jukas/JukaLord.cs b/Scripts/Mobiles/Monsters/LBR/Jukas/JukaLord.cs index ba5734093..2e7db2c80 100644 --- a/Scripts/Mobiles/Monsters/LBR/Jukas/JukaLord.cs +++ b/Scripts/Mobiles/Monsters/LBR/Jukas/JukaLord.cs @@ -108,7 +108,7 @@ namespace Server.Mobiles public override bool AlwaysMurderer => true; public override bool BardImmune => !Core.AOS; public override bool CanRummageCorpses => true; - public override int Meat{ get{ return 1; } } + public override int Meat => 1; public JukaLord( Serial serial ) : base( serial ) { diff --git a/Scripts/Mobiles/Monsters/LBR/Jukas/JukaMage.cs b/Scripts/Mobiles/Monsters/LBR/Jukas/JukaMage.cs index 957108245..0c43997dd 100644 --- a/Scripts/Mobiles/Monsters/LBR/Jukas/JukaMage.cs +++ b/Scripts/Mobiles/Monsters/LBR/Jukas/JukaMage.cs @@ -99,7 +99,7 @@ namespace Server.Mobiles public override bool AlwaysMurderer => true; public override bool CanRummageCorpses => true; - public override int Meat{ get{ return 1; } } + public override int Meat => 1; private DateTime m_NextAbilityTime; diff --git a/Scripts/Mobiles/Monsters/LBR/Jukas/JukaWarrior.cs b/Scripts/Mobiles/Monsters/LBR/Jukas/JukaWarrior.cs index a0c64b58f..4b1b061b2 100644 --- a/Scripts/Mobiles/Monsters/LBR/Jukas/JukaWarrior.cs +++ b/Scripts/Mobiles/Monsters/LBR/Jukas/JukaWarrior.cs @@ -78,7 +78,7 @@ namespace Server.Mobiles public override bool AlwaysMurderer => true; public override bool CanRummageCorpses => true; - public override int Meat{ get{ return 1; } } + public override int Meat => 1; public override void OnGaveMeleeAttack( Mobile defender ) { diff --git a/Scripts/Mobiles/Monsters/LBR/Meers/MeerEternal.cs b/Scripts/Mobiles/Monsters/LBR/Meers/MeerEternal.cs index f7b3bfc75..906ab4585 100644 --- a/Scripts/Mobiles/Monsters/LBR/Meers/MeerEternal.cs +++ b/Scripts/Mobiles/Monsters/LBR/Meers/MeerEternal.cs @@ -59,7 +59,7 @@ namespace Server.Mobiles public override bool BardImmune => !Core.AOS; public override bool CanRummageCorpses => true; public override Poison PoisonImmune => Poison.Lethal; - public override int TreasureMapLevel{ get{ return Core.AOS ? 5 : 4; } } + public override int TreasureMapLevel => Core.AOS ? 5 : 4; public override bool InitialInnocent => true; diff --git a/Scripts/Mobiles/Monsters/LBR/Meers/MeerMage.cs b/Scripts/Mobiles/Monsters/LBR/Meers/MeerMage.cs index 893d4292b..3c5277f4e 100644 --- a/Scripts/Mobiles/Monsters/LBR/Meers/MeerMage.cs +++ b/Scripts/Mobiles/Monsters/LBR/Meers/MeerMage.cs @@ -58,7 +58,7 @@ namespace Server.Mobiles public override bool AutoDispel => true; public override Poison PoisonImmune => Poison.Lethal; public override bool CanRummageCorpses => true; - public override int TreasureMapLevel{ get{ return 3; } } + public override int TreasureMapLevel => 3; public override bool InitialInnocent => true; diff --git a/Scripts/Mobiles/Monsters/ML/Animal/CuSidhe.cs b/Scripts/Mobiles/Monsters/ML/Animal/CuSidhe.cs index d66b4e0a7..38b2dd30e 100644 --- a/Scripts/Mobiles/Monsters/ML/Animal/CuSidhe.cs +++ b/Scripts/Mobiles/Monsters/ML/Animal/CuSidhe.cs @@ -94,11 +94,11 @@ namespace Server.Mobiles public override bool CanHeal => true; public override bool CanHealOwner => true; - public override FoodType FavoriteFood{ get{ return FoodType.FruitsAndVegies; } } - public override bool CanAngerOnTame{ get { return true; } } + public override FoodType FavoriteFood => FoodType.FruitsAndVegies; + public override bool CanAngerOnTame => true; public override bool StatLossAfterTame => true; - public override int Hides{ get{ return 10; } } - public override int Meat{ get{ return 3; } } + public override int Hides => 10; + public override int Meat => 3; public override WeaponAbility GetWeaponAbility() => WeaponAbility.BleedAttack; diff --git a/Scripts/Mobiles/Monsters/ML/Animal/Ferret.cs b/Scripts/Mobiles/Monsters/ML/Animal/Ferret.cs index d93ed133d..e63935087 100644 --- a/Scripts/Mobiles/Monsters/ML/Animal/Ferret.cs +++ b/Scripts/Mobiles/Monsters/ML/Animal/Ferret.cs @@ -41,8 +41,8 @@ namespace Server.Mobiles m_CanTalk = true; } - public override int Meat{ get{ return 1; } } - public override FoodType FavoriteFood{ get{ return FoodType.Fish; } } + public override int Meat => 1; + public override FoodType FavoriteFood => FoodType.Fish; public Ferret( Serial serial ) : base( serial ) { diff --git a/Scripts/Mobiles/Monsters/ML/Animal/RagingGrizzlyBear.cs b/Scripts/Mobiles/Monsters/ML/Animal/RagingGrizzlyBear.cs index 4e9492515..9bcf35242 100644 --- a/Scripts/Mobiles/Monsters/ML/Animal/RagingGrizzlyBear.cs +++ b/Scripts/Mobiles/Monsters/ML/Animal/RagingGrizzlyBear.cs @@ -45,9 +45,9 @@ namespace Server.Mobiles } - public override int Meat{ get{ return 4; } } - public override int Hides{ get{ return 32; } } - public override PackInstinct PackInstinct{ get{ return PackInstinct.Bear; } } + public override int Meat => 4; + public override int Hides => 32; + public override PackInstinct PackInstinct => PackInstinct.Bear; public RagingGrizzlyBear( Serial serial ) : base( serial ) { diff --git a/Scripts/Mobiles/Monsters/ML/Animal/Squirrel.cs b/Scripts/Mobiles/Monsters/ML/Animal/Squirrel.cs index 729484ccd..fa841a9f9 100644 --- a/Scripts/Mobiles/Monsters/ML/Animal/Squirrel.cs +++ b/Scripts/Mobiles/Monsters/ML/Animal/Squirrel.cs @@ -39,8 +39,8 @@ namespace Server.Mobiles MinTameSkill = -21.3; } - public override int Meat{ get{ return 1; } } - public override FoodType FavoriteFood{ get{ return FoodType.FruitsAndVegies; } } + public override int Meat => 1; + public override FoodType FavoriteFood => FoodType.FruitsAndVegies; public Squirrel( Serial serial ) : base( serial ) { diff --git a/Scripts/Mobiles/Monsters/ML/Bedlam/LadyJennifyr.cs b/Scripts/Mobiles/Monsters/ML/Bedlam/LadyJennifyr.cs index 6c4397bc6..1c7e7b32b 100644 --- a/Scripts/Mobiles/Monsters/ML/Bedlam/LadyJennifyr.cs +++ b/Scripts/Mobiles/Monsters/ML/Bedlam/LadyJennifyr.cs @@ -54,9 +54,7 @@ namespace Server.Mobiles if ( Utility.RandomDouble() < 0.1 ) { - ExpireTimer timer; - - if ( m_Table.TryGetValue( defender, out timer ) ) + if (m_Table.TryGetValue( defender, out ExpireTimer timer )) timer.DoExpire(); defender.FixedParticles( 0x3709, 10, 30, 5052, EffectLayer.LeftFoot ); diff --git a/Scripts/Mobiles/Monsters/ML/Bedlam/MasterJonath.cs b/Scripts/Mobiles/Monsters/ML/Bedlam/MasterJonath.cs index fee456514..7213deeb8 100644 --- a/Scripts/Mobiles/Monsters/ML/Bedlam/MasterJonath.cs +++ b/Scripts/Mobiles/Monsters/ML/Bedlam/MasterJonath.cs @@ -75,7 +75,7 @@ namespace Server.Mobiles */ public override bool GivesMLMinorArtifact => true; - public override int TreasureMapLevel{ get{ return 5; } } + public override int TreasureMapLevel => 5; public MasterJonath( Serial serial ) : base( serial ) diff --git a/Scripts/Mobiles/Monsters/ML/Bedlam/MasterTheophilus.cs b/Scripts/Mobiles/Monsters/ML/Bedlam/MasterTheophilus.cs index a39564d8c..3986ad37e 100644 --- a/Scripts/Mobiles/Monsters/ML/Bedlam/MasterTheophilus.cs +++ b/Scripts/Mobiles/Monsters/ML/Bedlam/MasterTheophilus.cs @@ -69,7 +69,7 @@ namespace Server.Mobiles public override WeaponAbility GetWeaponAbility() => WeaponAbility.ParalyzingBlow; public override bool GivesMLMinorArtifact => true; - public override int TreasureMapLevel{ get{ return 5; } } + public override int TreasureMapLevel => 5; public MasterTheophilus( Serial serial ) : base( serial ) diff --git a/Scripts/Mobiles/Monsters/ML/Bedlam/RedDeath.cs b/Scripts/Mobiles/Monsters/ML/Bedlam/RedDeath.cs index 054321b27..56e21f657 100644 --- a/Scripts/Mobiles/Monsters/ML/Bedlam/RedDeath.cs +++ b/Scripts/Mobiles/Monsters/ML/Bedlam/RedDeath.cs @@ -68,8 +68,8 @@ namespace Server.Mobiles public override bool GivesMLMinorArtifact => true; public override bool AlwaysMurderer => true; public override bool HasBreath => true; - public override int BreathChaosDamage{ get { return 100; } } - public override int BreathFireDamage{ get{ return 0; } } + public override int BreathChaosDamage => 100; + public override int BreathFireDamage => 0; public RedDeath( Serial serial ) : base( serial ) diff --git a/Scripts/Mobiles/Monsters/ML/Blighted Grove/Coil.cs b/Scripts/Mobiles/Monsters/ML/Blighted Grove/Coil.cs index 506af4e70..2045ad82f 100644 --- a/Scripts/Mobiles/Monsters/ML/Blighted Grove/Coil.cs +++ b/Scripts/Mobiles/Monsters/ML/Blighted Grove/Coil.cs @@ -76,11 +76,11 @@ namespace Server.Mobiles */ } - public override Poison HitPoison { get { return Poison.Lethal; } } - public override Poison PoisonImmune { get { return Poison.Lethal; } } + public override Poison HitPoison => Poison.Lethal; + public override Poison PoisonImmune => Poison.Lethal; public override bool GivesMLMinorArtifact => true; - public override int Hides { get { return 48; } } - public override int Meat { get { return 1; } } + public override int Hides => 48; + public override int Meat => 1; public Coil( Serial serial ) : base( serial ) diff --git a/Scripts/Mobiles/Monsters/ML/Blighted Grove/Hydra.cs b/Scripts/Mobiles/Monsters/ML/Blighted Grove/Hydra.cs index 32b591329..1bb0e5bdd 100644 --- a/Scripts/Mobiles/Monsters/ML/Blighted Grove/Hydra.cs +++ b/Scripts/Mobiles/Monsters/ML/Blighted Grove/Hydra.cs @@ -66,9 +66,9 @@ namespace Server.Mobiles } public override bool HasBreath => true; - public override int Hides { get { return 40; } } - public override int Meat { get { return 19; } } - public override int TreasureMapLevel { get { return 5; } } + public override int Hides => 40; + public override int Meat => 19; + public override int TreasureMapLevel => 5; public Hydra( Serial serial ) : base( serial ) diff --git a/Scripts/Mobiles/Monsters/ML/Blighted Grove/Tangle.cs b/Scripts/Mobiles/Monsters/ML/Blighted Grove/Tangle.cs index 96d1ad324..84488a098 100644 --- a/Scripts/Mobiles/Monsters/ML/Blighted Grove/Tangle.cs +++ b/Scripts/Mobiles/Monsters/ML/Blighted Grove/Tangle.cs @@ -55,7 +55,7 @@ namespace Server.Mobiles c.DropItem( new TaintedSeeds() ); } - public override Poison PoisonImmune { get { return Poison.Lethal; } } + public override Poison PoisonImmune => Poison.Lethal; public Tangle( Serial serial ) : base( serial ) diff --git a/Scripts/Mobiles/Monsters/ML/Blighted Grove/Thrasher.cs b/Scripts/Mobiles/Monsters/ML/Blighted Grove/Thrasher.cs index 0b3de5469..65ea7807b 100644 --- a/Scripts/Mobiles/Monsters/ML/Blighted Grove/Thrasher.cs +++ b/Scripts/Mobiles/Monsters/ML/Blighted Grove/Thrasher.cs @@ -54,8 +54,8 @@ namespace Server.Mobiles } public override bool GivesMLMinorArtifact => true; - public override int Hides { get { return 48; } } - public override int Meat { get { return 1; } } + public override int Hides => 48; + public override int Meat => 1; public Thrasher( Serial serial ) : base( serial ) diff --git a/Scripts/Mobiles/Monsters/ML/Humanoid/Magic/MLDryad.cs b/Scripts/Mobiles/Monsters/ML/Humanoid/Magic/MLDryad.cs index ceb156f53..61aa828c3 100644 --- a/Scripts/Mobiles/Monsters/ML/Humanoid/Magic/MLDryad.cs +++ b/Scripts/Mobiles/Monsters/ML/Humanoid/Magic/MLDryad.cs @@ -61,7 +61,7 @@ namespace Server.Mobiles AddLoot( LootPack.MlRich ); } - public override int Meat { get { return 1; } } + public override int Meat => 1; public override void OnThink() { diff --git a/Scripts/Mobiles/Monsters/ML/Humanoid/Magic/Satyr.cs b/Scripts/Mobiles/Monsters/ML/Humanoid/Magic/Satyr.cs index a6d2ad4fb..c5a5625eb 100644 --- a/Scripts/Mobiles/Monsters/ML/Humanoid/Magic/Satyr.cs +++ b/Scripts/Mobiles/Monsters/ML/Humanoid/Magic/Satyr.cs @@ -217,7 +217,7 @@ namespace Server.Mobiles } #endregion - public override int Meat { get { return 1; } } + public override int Meat => 1; public Satyr( Serial serial ) : base( serial ) { diff --git a/Scripts/Mobiles/Monsters/ML/Humanoid/Melee/Tormented Minotaur.cs b/Scripts/Mobiles/Monsters/ML/Humanoid/Melee/Tormented Minotaur.cs index d9548ebbd..c2b691c69 100644 --- a/Scripts/Mobiles/Monsters/ML/Humanoid/Melee/Tormented Minotaur.cs +++ b/Scripts/Mobiles/Monsters/ML/Humanoid/Melee/Tormented Minotaur.cs @@ -47,7 +47,7 @@ namespace Server.Mobiles } public override Poison PoisonImmune => Poison.Deadly; - public override int TreasureMapLevel{ get{ return 3; } } + public override int TreasureMapLevel => 3; public override int GetDeathSound() { return 0x596; } public override int GetAttackSound() { return 0x597; } diff --git a/Scripts/Mobiles/Monsters/ML/Labyrinth/Miasma.cs b/Scripts/Mobiles/Monsters/ML/Labyrinth/Miasma.cs index ccb6d5c9b..910407d16 100644 --- a/Scripts/Mobiles/Monsters/ML/Labyrinth/Miasma.cs +++ b/Scripts/Mobiles/Monsters/ML/Labyrinth/Miasma.cs @@ -45,12 +45,12 @@ namespace Server.Mobiles } /* yes, this is OSI style */ - public override double WeaponAbilityChance { get { return 0.75; } } - public override double HitPoisonChance { get { return 0.35; } } - public override Poison HitPoison { get { return ( Poison.Lethal ); } } + public override double WeaponAbilityChance => 0.75; + public override double HitPoisonChance => 0.35; + public override Poison HitPoison => ( Poison.Lethal ); public override bool HasManaOveride => true; public override bool GivesMLMinorArtifact => true; - public override int TreasureMapLevel { get { return 5; } } + public override int TreasureMapLevel => 5; public override void GenerateLoot() { diff --git a/Scripts/Mobiles/Monsters/ML/Labyrinth/Pyre.cs b/Scripts/Mobiles/Monsters/ML/Labyrinth/Pyre.cs index b3b213576..ffb4b7b50 100644 --- a/Scripts/Mobiles/Monsters/ML/Labyrinth/Pyre.cs +++ b/Scripts/Mobiles/Monsters/ML/Labyrinth/Pyre.cs @@ -63,7 +63,7 @@ namespace Server.Mobiles } public override bool GivesMLMinorArtifact => true; - public override int TreasureMapLevel{ get{ return 5; } } + public override int TreasureMapLevel => 5; public override bool HasAura => true; public Pyre( Serial serial ) diff --git a/Scripts/Mobiles/Monsters/ML/Misc/Magic/GreaterDragon.cs b/Scripts/Mobiles/Monsters/ML/Misc/Magic/GreaterDragon.cs index 0b7782036..ddaca9741 100644 --- a/Scripts/Mobiles/Monsters/ML/Misc/Magic/GreaterDragon.cs +++ b/Scripts/Mobiles/Monsters/ML/Misc/Magic/GreaterDragon.cs @@ -61,13 +61,13 @@ namespace Server.Mobiles public override bool ReacquireOnMovement => !Controlled; public override bool HasBreath => true; // fire breath enabled public override bool AutoDispel => !Controlled; - public override int TreasureMapLevel{ get{ return 5; } } - public override int Meat{ get{ return 19; } } - public override int Hides{ get{ return 30; } } - public override HideType HideType{ get{ return HideType.Barbed; } } - public override int Scales{ get{ return 7; } } - public override ScaleType ScaleType{ get{ return ( Body == 12 ? ScaleType.Yellow : ScaleType.Red ); } } - public override FoodType FavoriteFood{ get{ return FoodType.Meat; } } + public override int TreasureMapLevel => 5; + public override int Meat => 19; + public override int Hides => 30; + public override HideType HideType => HideType.Barbed; + public override int Scales => 7; + public override ScaleType ScaleType => ( Body == 12 ? ScaleType.Yellow : ScaleType.Red ); + public override FoodType FavoriteFood => FoodType.Meat; public override bool CanAngerOnTame => true; public override bool CanFly => true; diff --git a/Scripts/Mobiles/Monsters/ML/Misc/Melee/CorrosiveSlime.cs b/Scripts/Mobiles/Monsters/ML/Misc/Melee/CorrosiveSlime.cs index 6f5157c10..579e7ae1b 100644 --- a/Scripts/Mobiles/Monsters/ML/Misc/Melee/CorrosiveSlime.cs +++ b/Scripts/Mobiles/Monsters/ML/Misc/Melee/CorrosiveSlime.cs @@ -8,7 +8,7 @@ namespace Server.Mobiles [CorpseName( "a slimey corpse" )] public class CorrosiveSlime : BaseCreature { - public override string DefaultName { get { return "a corrosive slime"; } } + public override string DefaultName => "a corrosive slime"; [Constructible] public CorrosiveSlime() : base( AIType.AI_Melee, FightMode.Closest, 10, 1, 0.2, 0.4 ) @@ -53,10 +53,10 @@ namespace Server.Mobiles AddLoot( LootPack.Gems ); } - public override Poison PoisonImmune { get { return Poison.Regular; } } - public override Poison HitPoison { get { return Poison.Regular; } } - public override FoodType FavoriteFood{ get{ return FoodType.Fish; } } - + public override Poison PoisonImmune => Poison.Regular; + public override Poison HitPoison => Poison.Regular; + public override FoodType FavoriteFood => FoodType.Fish; + //TODO: Damage weapon via acid public CorrosiveSlime( Serial serial ) : base( serial ) diff --git a/Scripts/Mobiles/Monsters/ML/Misc/Melee/Reptalon.cs b/Scripts/Mobiles/Monsters/ML/Misc/Melee/Reptalon.cs index 1ffbbc7e9..2cf5d3c91 100644 --- a/Scripts/Mobiles/Monsters/ML/Misc/Melee/Reptalon.cs +++ b/Scripts/Mobiles/Monsters/ML/Misc/Melee/Reptalon.cs @@ -47,13 +47,13 @@ namespace Server.Mobiles public override WeaponAbility GetWeaponAbility() => WeaponAbility.ParalyzingBlow; - public override int TreasureMapLevel{ get{ return 5; } } - public override int Meat{ get{ return 5; } } - public override int Hides{ get{ return 10; } } + public override int TreasureMapLevel => 5; + public override int Meat => 5; + public override int Hides => 10; public override bool CanBreath => true; - public override bool CanAngerOnTame{ get { return true; } } + public override bool CanAngerOnTame => true; public override bool StatLossAfterTame => true; - public override FoodType FavoriteFood{ get{ return FoodType.Meat; } } + public override FoodType FavoriteFood => FoodType.Meat; public override bool CanFly => true; public Reptalon( Serial serial ) : base( serial ) diff --git a/Scripts/Mobiles/Monsters/ML/Painted Caves/Lurg.cs b/Scripts/Mobiles/Monsters/ML/Painted Caves/Lurg.cs index 7584e4de9..24185abf6 100644 --- a/Scripts/Mobiles/Monsters/ML/Painted Caves/Lurg.cs +++ b/Scripts/Mobiles/Monsters/ML/Painted Caves/Lurg.cs @@ -52,7 +52,7 @@ namespace Server.Mobiles public override WeaponAbility GetWeaponAbility() => WeaponAbility.CrushingBlow; public override bool GivesMLMinorArtifact => true; - public override int TreasureMapLevel{ get{ return 4; } } + public override int TreasureMapLevel => 4; public Lurg( Serial serial ) : base( serial ) diff --git a/Scripts/Mobiles/Monsters/ML/Palace of Paroxysmus/Putrefier.cs b/Scripts/Mobiles/Monsters/ML/Palace of Paroxysmus/Putrefier.cs index 810d58ca3..fe1406de2 100644 --- a/Scripts/Mobiles/Monsters/ML/Palace of Paroxysmus/Putrefier.cs +++ b/Scripts/Mobiles/Monsters/ML/Palace of Paroxysmus/Putrefier.cs @@ -71,7 +71,7 @@ namespace Server.Mobiles public override bool GivesMLMinorArtifact => true; public override Poison HitPoison => Poison.Deadly; // Becomes Lethal with Paragon bonus - public override int TreasureMapLevel{ get{ return 5; } } + public override int TreasureMapLevel => 5; public Putrefier( Serial serial ) : base( serial ) diff --git a/Scripts/Mobiles/Monsters/ML/Prism of Light/CorporealBrume.cs b/Scripts/Mobiles/Monsters/ML/Prism of Light/CorporealBrume.cs index 7bde34f5a..3b0e62541 100644 --- a/Scripts/Mobiles/Monsters/ML/Prism of Light/CorporealBrume.cs +++ b/Scripts/Mobiles/Monsters/ML/Prism of Light/CorporealBrume.cs @@ -7,7 +7,7 @@ namespace Server.Mobiles [CorpseName( "a corporeal brume corpse" )] public class CorporealBrume : BaseCreature { - public override string DefaultName { get { return "a corporeal brume"; } } + public override string DefaultName => "a corporeal brume"; [Constructible] public CorporealBrume() @@ -48,13 +48,13 @@ namespace Server.Mobiles } // TODO: Verify area attack specifics - public override bool HasAura { get { return ( Combatant != null ); } } - public override TimeSpan AuraInterval { get { return TimeSpan.FromSeconds( 20 ); } } - public override int AuraRange { get { return 10; } } + public override bool HasAura => ( Combatant != null ); + public override TimeSpan AuraInterval => TimeSpan.FromSeconds( 20 ); + public override int AuraRange => 10; - public override int AuraBaseDamage { get { return Utility.RandomMinMax( 25, 35 ); } } - public override int AuraFireDamage { get { return 0; } } - public override int AuraColdDamage { get { return 100; } } + public override int AuraBaseDamage => Utility.RandomMinMax( 25, 35 ); + public override int AuraFireDamage => 0; + public override int AuraColdDamage => 100; public override void AuraEffect( Mobile m ) { @@ -81,4 +81,4 @@ namespace Server.Mobiles int version = reader.ReadInt(); } } -} \ No newline at end of file +} diff --git a/Scripts/Mobiles/Monsters/ML/Prism of Light/CrystalDaemon.cs b/Scripts/Mobiles/Monsters/ML/Prism of Light/CrystalDaemon.cs index 8dce255fb..a7546da17 100644 --- a/Scripts/Mobiles/Monsters/ML/Prism of Light/CrystalDaemon.cs +++ b/Scripts/Mobiles/Monsters/ML/Prism of Light/CrystalDaemon.cs @@ -7,7 +7,7 @@ namespace Server.Mobiles [CorpseName( "a crystal daemon corpse" )] public class CrystalDaemon : BaseCreature { - public override string DefaultName { get { return "a crystal daemon"; } } + public override string DefaultName => "a crystal daemon"; [Constructible] public CrystalDaemon() diff --git a/Scripts/Mobiles/Monsters/ML/Prism of Light/CrystalLatticeSeeker.cs b/Scripts/Mobiles/Monsters/ML/Prism of Light/CrystalLatticeSeeker.cs index ae6255d58..0f5a606ae 100644 --- a/Scripts/Mobiles/Monsters/ML/Prism of Light/CrystalLatticeSeeker.cs +++ b/Scripts/Mobiles/Monsters/ML/Prism of Light/CrystalLatticeSeeker.cs @@ -7,7 +7,7 @@ namespace Server.Mobiles [CorpseName( "a Crystal Lattice Seeker corpse" )] public class CrystalLatticeSeeker : BaseCreature { - public override string DefaultName { get { return "Crystal Lattice Seeker"; } } + public override string DefaultName => "Crystal Lattice Seeker"; [Constructible] public CrystalLatticeSeeker() @@ -123,8 +123,8 @@ namespace Server.Mobiles } */ - public override int Feathers { get { return 100; } } - public override int TreasureMapLevel { get { return 5; } } + public override int Feathers => 100; + public override int TreasureMapLevel => 5; public override int GetAttackSound() { return 0x2F6; } public override int GetDeathSound() { return 0x2F7; } diff --git a/Scripts/Mobiles/Monsters/ML/Prism of Light/CrystalSeaSerpent.cs b/Scripts/Mobiles/Monsters/ML/Prism of Light/CrystalSeaSerpent.cs index efd29cf79..4f224f63c 100644 --- a/Scripts/Mobiles/Monsters/ML/Prism of Light/CrystalSeaSerpent.cs +++ b/Scripts/Mobiles/Monsters/ML/Prism of Light/CrystalSeaSerpent.cs @@ -7,7 +7,7 @@ namespace Server.Mobiles [CorpseName( "a crystal sea serpent corpse" )] public class CrystalSeaSerpent : SeaSerpent { - public override string DefaultName { get { return "a crystal sea serpent"; } } + public override string DefaultName => "a crystal sea serpent"; [Constructible] public CrystalSeaSerpent() diff --git a/Scripts/Mobiles/Monsters/ML/Prism of Light/CrystalVortex.cs b/Scripts/Mobiles/Monsters/ML/Prism of Light/CrystalVortex.cs index f3c18312e..badeab4fc 100644 --- a/Scripts/Mobiles/Monsters/ML/Prism of Light/CrystalVortex.cs +++ b/Scripts/Mobiles/Monsters/ML/Prism of Light/CrystalVortex.cs @@ -7,7 +7,7 @@ namespace Server.Mobiles [CorpseName( "a crystal vortex corpse" )] public class CrystalVortex : BaseCreature { - public override string DefaultName { get { return "a crystal vortex"; } } + public override string DefaultName => "a crystal vortex"; [Constructible] public CrystalVortex() diff --git a/Scripts/Mobiles/Monsters/ML/Prism of Light/CrystalWisp.cs b/Scripts/Mobiles/Monsters/ML/Prism of Light/CrystalWisp.cs index 94f6f5ad1..e5ea9a659 100644 --- a/Scripts/Mobiles/Monsters/ML/Prism of Light/CrystalWisp.cs +++ b/Scripts/Mobiles/Monsters/ML/Prism of Light/CrystalWisp.cs @@ -6,7 +6,7 @@ namespace Server.Mobiles { public class CrystalWisp : Wisp { - public override string DefaultName { get { return "a crystal wisp"; } } + public override string DefaultName => "a crystal wisp"; [Constructible] public CrystalWisp() diff --git a/Scripts/Mobiles/Monsters/ML/Sanctuary/Chiikkaha.cs b/Scripts/Mobiles/Monsters/ML/Sanctuary/Chiikkaha.cs index d8e5aabb8..fc60caaf8 100644 --- a/Scripts/Mobiles/Monsters/ML/Sanctuary/Chiikkaha.cs +++ b/Scripts/Mobiles/Monsters/ML/Sanctuary/Chiikkaha.cs @@ -9,7 +9,7 @@ namespace Server.Mobiles [CorpseName( "a Chiikkaha the Toothed corpse" )] public class Chiikkaha : RatmanMage { - public override string DefaultName { get { return "Chiikkaha the Toothed"; } } + public override string DefaultName => "Chiikkaha the Toothed"; [Constructible] public Chiikkaha() diff --git a/Scripts/Mobiles/Monsters/ML/Special/Meraktus.cs b/Scripts/Mobiles/Monsters/ML/Special/Meraktus.cs index ecf19c8f0..2edd418f9 100644 --- a/Scripts/Mobiles/Monsters/ML/Special/Meraktus.cs +++ b/Scripts/Mobiles/Monsters/ML/Special/Meraktus.cs @@ -152,11 +152,11 @@ namespace Server.Mobiles return 0x59c; } - public override int Meat { get { return 2; } } - public override int Hides { get { return 10; } } - public override HideType HideType { get { return HideType.Regular; } } + public override int Meat => 2; + public override int Hides => 10; + public override HideType HideType => HideType.Regular; public override Poison PoisonImmune => Poison.Regular; - public override int TreasureMapLevel{ get{ return 3; } } + public override int TreasureMapLevel => 3; public override bool BardImmune => true; public override bool Unprovokable => true; public override bool Uncalmable => true; diff --git a/Scripts/Mobiles/Monsters/ML/Special/Twaulo.cs b/Scripts/Mobiles/Monsters/ML/Special/Twaulo.cs index 43bcf4bc4..adba4ba54 100644 --- a/Scripts/Mobiles/Monsters/ML/Special/Twaulo.cs +++ b/Scripts/Mobiles/Monsters/ML/Special/Twaulo.cs @@ -11,13 +11,13 @@ namespace Server.Mobiles [CorpseName("a corpse of Twaulo")] public class Twaulo : BaseChampion { - public override ChampionSkullType SkullType{ get{ return ChampionSkullType.Pain; } } + public override ChampionSkullType SkullType => ChampionSkullType.Pain; - public override Type[] UniqueList{ get{ return new Type[] { typeof( Quell ) }; } } - public override Type[] SharedList{ get{ return new Type[] { typeof( TheMostKnowledgePerson ), typeof( OblivionsNeedle ) }; } } - public override Type[] DecorativeList{ get{ return new Type[] { typeof( Pier ), typeof( MonsterStatuette ) }; } } + public override Type[] UniqueList => new Type[] { typeof( Quell ) }; + public override Type[] SharedList => new Type[] { typeof( TheMostKnowledgePerson ), typeof( OblivionsNeedle ) }; + public override Type[] DecorativeList => new Type[] { typeof( Pier ), typeof( MonsterStatuette ) }; - public override MonsterStatuetteType[] StatueTypes{ get{ return new MonsterStatuetteType[] { MonsterStatuetteType.DreadHorn }; } } + public override MonsterStatuetteType[] StatueTypes => new MonsterStatuetteType[] { MonsterStatuetteType.DreadHorn }; public override string DefaultName => "Twaulo"; @@ -78,10 +78,10 @@ namespace Server.Mobiles public override bool Unprovokable => true; public override Poison PoisonImmune => Poison.Regular; - public override int TreasureMapLevel{ get{ return 5; } } - public override int Meat { get { return 1; } } - public override int Hides { get { return 8; } } - public override HideType HideType { get { return HideType.Spined; } } + public override int TreasureMapLevel => 5; + public override int Meat => 1; + public override int Hides => 8; + public override HideType HideType => HideType.Spined; public void SpawnPixies( Mobile target ) { diff --git a/Scripts/Mobiles/Monsters/ML/Twisted Weald/Gnaw.cs b/Scripts/Mobiles/Monsters/ML/Twisted Weald/Gnaw.cs index 409de0d4f..db9d890f2 100644 --- a/Scripts/Mobiles/Monsters/ML/Twisted Weald/Gnaw.cs +++ b/Scripts/Mobiles/Monsters/ML/Twisted Weald/Gnaw.cs @@ -48,8 +48,8 @@ namespace Server.Mobiles } public override bool GivesMLMinorArtifact => true; - public override int Hides{ get{ return 28; } } - public override int Meat{ get{ return 4; } } + public override int Hides => 28; + public override int Meat => 4; /* // TODO: uncomment once added diff --git a/Scripts/Mobiles/Monsters/ML/Twisted Weald/Guile.cs b/Scripts/Mobiles/Monsters/ML/Twisted Weald/Guile.cs index 3d6b3a1a5..24cd30e9e 100644 --- a/Scripts/Mobiles/Monsters/ML/Twisted Weald/Guile.cs +++ b/Scripts/Mobiles/Monsters/ML/Twisted Weald/Guile.cs @@ -8,7 +8,7 @@ namespace Server.Mobiles public class Guile : Changeling { public override string DefaultName => "Guile"; - public override int DefaultHue{ get{ return 0x3F; } } + public override int DefaultHue => 0x3F; [Constructible] public Guile() diff --git a/Scripts/Mobiles/Monsters/ML/Twisted Weald/Irk.cs b/Scripts/Mobiles/Monsters/ML/Twisted Weald/Irk.cs index 3a0d94f34..d37780b20 100644 --- a/Scripts/Mobiles/Monsters/ML/Twisted Weald/Irk.cs +++ b/Scripts/Mobiles/Monsters/ML/Twisted Weald/Irk.cs @@ -8,7 +8,7 @@ namespace Server.Mobiles public class Irk : Changeling { public override string DefaultName => "Irk"; - public override int DefaultHue{ get{ return 0x489; } } + public override int DefaultHue => 0x489; [Constructible] public Irk() diff --git a/Scripts/Mobiles/Monsters/ML/Twisted Weald/Spite.cs b/Scripts/Mobiles/Monsters/ML/Twisted Weald/Spite.cs index c83446875..876f89504 100644 --- a/Scripts/Mobiles/Monsters/ML/Twisted Weald/Spite.cs +++ b/Scripts/Mobiles/Monsters/ML/Twisted Weald/Spite.cs @@ -8,7 +8,7 @@ namespace Server.Mobiles public class Spite : Changeling { public override string DefaultName => "Spite"; - public override int DefaultHue{ get{ return 0x21; } } + public override int DefaultHue => 0x21; [Constructible] public Spite() diff --git a/Scripts/Mobiles/Monsters/ML/Twisted Weald/Swoop.cs b/Scripts/Mobiles/Monsters/ML/Twisted Weald/Swoop.cs index a64588bf4..8e6dda1f2 100644 --- a/Scripts/Mobiles/Monsters/ML/Twisted Weald/Swoop.cs +++ b/Scripts/Mobiles/Monsters/ML/Twisted Weald/Swoop.cs @@ -111,7 +111,7 @@ namespace Server.Mobiles public override bool CanFly => true; public override bool GivesMLMinorArtifact => true; - public override int Feathers{ get{ return 72; } } + public override int Feathers => 72; /* // TODO: uncomment once added diff --git a/Scripts/Mobiles/Monsters/Mammal/Melee/HellHound.cs b/Scripts/Mobiles/Monsters/Mammal/Melee/HellHound.cs index 9aaf3ff7f..28fef31ff 100644 --- a/Scripts/Mobiles/Monsters/Mammal/Melee/HellHound.cs +++ b/Scripts/Mobiles/Monsters/Mammal/Melee/HellHound.cs @@ -51,9 +51,9 @@ namespace Server.Mobiles } public override bool HasBreath => true; // fire breath enabled - public override int Meat{ get{ return 1; } } - public override FoodType FavoriteFood{ get{ return FoodType.Meat; } } - public override PackInstinct PackInstinct{ get{ return PackInstinct.Canine; } } + public override int Meat => 1; + public override FoodType FavoriteFood => FoodType.Meat; + public override PackInstinct PackInstinct => PackInstinct.Canine; public HellHound( Serial serial ) : base( serial ) { diff --git a/Scripts/Mobiles/Monsters/Mammal/Melee/VorpalBunny.cs b/Scripts/Mobiles/Monsters/Mammal/Melee/VorpalBunny.cs index cecfc0329..5f4a761d0 100644 --- a/Scripts/Mobiles/Monsters/Mammal/Melee/VorpalBunny.cs +++ b/Scripts/Mobiles/Monsters/Mammal/Melee/VorpalBunny.cs @@ -105,8 +105,8 @@ namespace Server.Mobiles Timer.DelayCall( TimeSpan.FromSeconds( 5.0 ), new TimerCallback( Delete ) ); } - public override int Meat{ get{ return 1; } } - public override int Hides{ get{ return 1; } } + public override int Meat => 1; + public override int Hides => 1; public override bool BardImmune => !Core.AOS; public VorpalBunny( Serial serial ) : base( serial ) diff --git a/Scripts/Mobiles/Monsters/Misc/Magic/DarkWisp.cs b/Scripts/Mobiles/Monsters/Misc/Magic/DarkWisp.cs index 10e3e0413..7c39bdbfa 100644 --- a/Scripts/Mobiles/Monsters/Misc/Magic/DarkWisp.cs +++ b/Scripts/Mobiles/Monsters/Misc/Magic/DarkWisp.cs @@ -9,11 +9,11 @@ namespace Server.Mobiles [CorpseName( "a wisp corpse" )] public class DarkWisp : BaseCreature { - public override InhumanSpeech SpeechType{ get{ return InhumanSpeech.Wisp; } } + public override InhumanSpeech SpeechType => InhumanSpeech.Wisp; - public override Ethics.Ethic EthicAllegiance { get { return Ethics.Ethic.Evil; } } + public override Ethics.Ethic EthicAllegiance => Ethics.Ethic.Evil; - public override TimeSpan ReacquireDelay { get { return TimeSpan.FromSeconds( 1.0 ); } } + public override TimeSpan ReacquireDelay => TimeSpan.FromSeconds( 1.0 ); public override string DefaultName => "a wisp"; diff --git a/Scripts/Mobiles/Monsters/Misc/Magic/EtherealWarrior.cs b/Scripts/Mobiles/Monsters/Misc/Magic/EtherealWarrior.cs index 0ca36fd9a..bec85c2ab 100644 --- a/Scripts/Mobiles/Monsters/Misc/Magic/EtherealWarrior.cs +++ b/Scripts/Mobiles/Monsters/Misc/Magic/EtherealWarrior.cs @@ -46,7 +46,7 @@ namespace Server.Mobiles VirtualArmor = 120; } - public override int TreasureMapLevel{ get{ return Core.AOS ? 5 : 0; } } + public override int TreasureMapLevel => Core.AOS ? 5 : 0; public override void GenerateLoot() { @@ -84,7 +84,7 @@ namespace Server.Mobiles get{ return OppositionGroup.FeyAndUndead; } } - public override int Feathers{ get{ return 100; } } + public override int Feathers => 100; public override int GetAngerSound() { diff --git a/Scripts/Mobiles/Monsters/Misc/Magic/Pixie.cs b/Scripts/Mobiles/Monsters/Misc/Magic/Pixie.cs index 227911f05..7fabc1f65 100644 --- a/Scripts/Mobiles/Monsters/Misc/Magic/Pixie.cs +++ b/Scripts/Mobiles/Monsters/Misc/Magic/Pixie.cs @@ -62,9 +62,9 @@ namespace Server.Mobiles c.DropItem( new PixieLeg() ); } - public override HideType HideType{ get{ return HideType.Spined; } } - public override int Hides{ get{ return 5; } } - public override int Meat{ get{ return 1; } } + public override HideType HideType => HideType.Spined; + public override int Hides => 5; + public override int Meat => 1; public Pixie( Serial serial ) : base( serial ) { diff --git a/Scripts/Mobiles/Monsters/Misc/Magic/Wisp.cs b/Scripts/Mobiles/Monsters/Misc/Magic/Wisp.cs index e10448ec8..29a410da6 100644 --- a/Scripts/Mobiles/Monsters/Misc/Magic/Wisp.cs +++ b/Scripts/Mobiles/Monsters/Misc/Magic/Wisp.cs @@ -9,12 +9,12 @@ namespace Server.Mobiles [CorpseName( "a wisp corpse" )] public class Wisp : BaseCreature { - public override InhumanSpeech SpeechType{ get{ return InhumanSpeech.Wisp; } } + public override InhumanSpeech SpeechType => InhumanSpeech.Wisp; - public override Faction FactionAllegiance{ get{ return CouncilOfMages.Instance; } } - public override Ethics.Ethic EthicAllegiance { get { return Ethics.Ethic.Hero; } } + public override Faction FactionAllegiance => CouncilOfMages.Instance; + public override Ethics.Ethic EthicAllegiance => Ethics.Ethic.Hero; - public override TimeSpan ReacquireDelay { get { return TimeSpan.FromSeconds( 1.0 ); } } + public override TimeSpan ReacquireDelay => TimeSpan.FromSeconds( 1.0 ); public override string DefaultName => "a wisp"; diff --git a/Scripts/Mobiles/Monsters/Misc/Melee/AnimatedWeapon.cs b/Scripts/Mobiles/Monsters/Misc/Melee/AnimatedWeapon.cs index e7cc6bdc3..d41e42adc 100644 --- a/Scripts/Mobiles/Monsters/Misc/Melee/AnimatedWeapon.cs +++ b/Scripts/Mobiles/Monsters/Misc/Melee/AnimatedWeapon.cs @@ -8,8 +8,8 @@ namespace Server.Mobiles public override bool DeleteCorpseOnDeath => true; public override bool IsHouseSummonable => true; - public override double DispelDifficulty { get { return 0.0; } } - public override double DispelFocus { get { return 20.0; } } + public override double DispelDifficulty => 0.0; + public override double DispelFocus => 20.0; public override double GetFightModeRanking( Mobile m, FightMode acqType, bool bPlayerOnly ) { @@ -71,7 +71,7 @@ namespace Server.Mobiles } public override bool BleedImmune => true; - public override Poison PoisonImmune { get { return Poison.Lethal; } } + public override Poison PoisonImmune => Poison.Lethal; public override int GetAngerSound() { diff --git a/Scripts/Mobiles/Monsters/Misc/Melee/BladeSpirits.cs b/Scripts/Mobiles/Monsters/Misc/Melee/BladeSpirits.cs index a34f1df01..15a319fca 100644 --- a/Scripts/Mobiles/Monsters/Misc/Melee/BladeSpirits.cs +++ b/Scripts/Mobiles/Monsters/Misc/Melee/BladeSpirits.cs @@ -8,11 +8,11 @@ namespace Server.Mobiles [CorpseName( "a blade spirit corpse" )] public class BladeSpirits : BaseCreature { - public override bool DeleteCorpseOnDeath { get { return Core.AOS; } } + public override bool DeleteCorpseOnDeath => Core.AOS; public override bool IsHouseSummonable => true; - public override double DispelDifficulty { get { return 0.0; } } - public override double DispelFocus { get { return 20.0; } } + public override double DispelDifficulty => 0.0; + public override double DispelFocus => 20.0; public override double GetFightModeRanking( Mobile m, FightMode acqType, bool bPlayerOnly ) { @@ -59,7 +59,7 @@ namespace Server.Mobiles } public override bool BleedImmune => true; - public override Poison PoisonImmune { get { return Poison.Lethal; } } + public override Poison PoisonImmune => Poison.Lethal; public override int GetAngerSound() { diff --git a/Scripts/Mobiles/Monsters/Misc/Melee/Centaur.cs b/Scripts/Mobiles/Monsters/Misc/Melee/Centaur.cs index cfec78fbc..d0b627846 100644 --- a/Scripts/Mobiles/Monsters/Misc/Melee/Centaur.cs +++ b/Scripts/Mobiles/Monsters/Misc/Melee/Centaur.cs @@ -57,9 +57,9 @@ namespace Server.Mobiles get{ return OppositionGroup.FeyAndUndead; } } - public override int Meat{ get{ return 1; } } - public override int Hides{ get{ return 8; } } - public override HideType HideType{ get{ return HideType.Spined; } } + public override int Meat => 1; + public override int Hides => 8; + public override HideType HideType => HideType.Spined; public Centaur( Serial serial ) : base( serial ) { @@ -80,4 +80,4 @@ namespace Server.Mobiles BaseSoundID = 679; } } -} \ No newline at end of file +} diff --git a/Scripts/Mobiles/Monsters/Misc/Melee/EnergyVortex.cs b/Scripts/Mobiles/Monsters/Misc/Melee/EnergyVortex.cs index 155618c3f..6c43919a3 100644 --- a/Scripts/Mobiles/Monsters/Misc/Melee/EnergyVortex.cs +++ b/Scripts/Mobiles/Monsters/Misc/Melee/EnergyVortex.cs @@ -8,11 +8,11 @@ namespace Server.Mobiles [CorpseName( "an energy vortex corpse" )] public class EnergyVortex : BaseCreature { - public override bool DeleteCorpseOnDeath { get { return Summoned; } } + public override bool DeleteCorpseOnDeath => Summoned; public override bool AlwaysMurderer => true; // Or Llama vortices will appear gray. - public override double DispelDifficulty { get { return 80.0; } } - public override double DispelFocus { get { return 20.0; } } + public override double DispelDifficulty => 80.0; + public override double DispelFocus => 20.0; public override double GetFightModeRanking( Mobile m, FightMode acqType, bool bPlayerOnly ) { @@ -67,7 +67,7 @@ namespace Server.Mobiles } public override bool BleedImmune => true; - public override Poison PoisonImmune { get { return Poison.Lethal; } } + public override Poison PoisonImmune => Poison.Lethal; public override int GetAngerSound() { diff --git a/Scripts/Mobiles/Monsters/Misc/Melee/Golem.cs b/Scripts/Mobiles/Monsters/Misc/Melee/Golem.cs index b2fdc3f39..08c620215 100644 --- a/Scripts/Mobiles/Monsters/Misc/Melee/Golem.cs +++ b/Scripts/Mobiles/Monsters/Misc/Melee/Golem.cs @@ -14,7 +14,7 @@ namespace Server.Mobiles public override bool IsBondable => false; - public override FoodType FavoriteFood { get { return FoodType.None; } } + public override FoodType FavoriteFood => FoodType.None; public override bool CanBeDistracted => false; diff --git a/Scripts/Mobiles/Monsters/Misc/Melee/PlagueBeastLord.cs b/Scripts/Mobiles/Monsters/Misc/Melee/PlagueBeastLord.cs index 83baea592..2c8c7465d 100644 --- a/Scripts/Mobiles/Monsters/Misc/Melee/PlagueBeastLord.cs +++ b/Scripts/Mobiles/Monsters/Misc/Melee/PlagueBeastLord.cs @@ -7,7 +7,7 @@ namespace Server.Mobiles [CorpseName( "a plague beast lord corpse" )] public class PlagueBeastLord : BaseCreature, ICarvable, IScissorable { - public override Poison PoisonImmune { get { return Poison.Lethal; } } + public override Poison PoisonImmune => Poison.Lethal; private Mobile m_OpenedBy; diff --git a/Scripts/Mobiles/Monsters/Misc/Melee/Slime.cs b/Scripts/Mobiles/Monsters/Misc/Melee/Slime.cs index ab5478de1..4162284a6 100644 --- a/Scripts/Mobiles/Monsters/Misc/Melee/Slime.cs +++ b/Scripts/Mobiles/Monsters/Misc/Melee/Slime.cs @@ -54,7 +54,7 @@ namespace Server.Mobiles public override Poison PoisonImmune => Poison.Lesser; public override Poison HitPoison => Poison.Lesser; - public override FoodType FavoriteFood{ get{ return FoodType.Meat | FoodType.Fish | FoodType.FruitsAndVegies | FoodType.GrainsAndHay | FoodType.Eggs; } } + public override FoodType FavoriteFood => FoodType.Meat | FoodType.Fish | FoodType.FruitsAndVegies | FoodType.GrainsAndHay | FoodType.Eggs; public Slime( Serial serial ) : base( serial ) { diff --git a/Scripts/Mobiles/Monsters/Ore Elementals/AgapiteElemental.cs b/Scripts/Mobiles/Monsters/Ore Elementals/AgapiteElemental.cs index dc18d0681..334a41c87 100644 --- a/Scripts/Mobiles/Monsters/Ore Elementals/AgapiteElemental.cs +++ b/Scripts/Mobiles/Monsters/Ore Elementals/AgapiteElemental.cs @@ -58,7 +58,7 @@ namespace Server.Mobiles public override bool BleedImmune => true; public override bool AutoDispel => true; - public override int TreasureMapLevel{ get{ return 1; } } + public override int TreasureMapLevel => 1; public AgapiteElemental( Serial serial ) : base( serial ) { diff --git a/Scripts/Mobiles/Monsters/Ore Elementals/BronzeElemental.cs b/Scripts/Mobiles/Monsters/Ore Elementals/BronzeElemental.cs index 391cd10a1..ce426d3da 100644 --- a/Scripts/Mobiles/Monsters/Ore Elementals/BronzeElemental.cs +++ b/Scripts/Mobiles/Monsters/Ore Elementals/BronzeElemental.cs @@ -7,7 +7,7 @@ namespace Server.Mobiles [CorpseName( "an ore elemental corpse" )] public class BronzeElemental : BaseCreature { - public override string DefaultName { get { return "a bronze elemental"; } } + public override string DefaultName => "a bronze elemental"; [Constructible] public BronzeElemental() : this( 2 ) @@ -60,7 +60,7 @@ namespace Server.Mobiles public override bool BleedImmune => true; public override bool AutoDispel => true; - public override int TreasureMapLevel{ get{ return 1; } } + public override int TreasureMapLevel => 1; public BronzeElemental( Serial serial ) : base( serial ) { diff --git a/Scripts/Mobiles/Monsters/Ore Elementals/CopperElemental.cs b/Scripts/Mobiles/Monsters/Ore Elementals/CopperElemental.cs index 05ad8396f..ea7ca9725 100644 --- a/Scripts/Mobiles/Monsters/Ore Elementals/CopperElemental.cs +++ b/Scripts/Mobiles/Monsters/Ore Elementals/CopperElemental.cs @@ -7,7 +7,7 @@ namespace Server.Mobiles [CorpseName( "an ore elemental corpse" )] public class CopperElemental : BaseCreature { - public override string DefaultName { get { return "a copper elemental"; } } + public override string DefaultName => "a copper elemental"; [Constructible] public CopperElemental() : this( 2 ) @@ -58,7 +58,7 @@ namespace Server.Mobiles public override bool BleedImmune => true; public override bool AutoDispel => true; - public override int TreasureMapLevel{ get{ return 1; } } + public override int TreasureMapLevel => 1; public override void CheckReflect( Mobile caster, ref bool reflect ) { diff --git a/Scripts/Mobiles/Monsters/Ore Elementals/DullCopperElemental.cs b/Scripts/Mobiles/Monsters/Ore Elementals/DullCopperElemental.cs index 9dcde6386..178d9ad12 100644 --- a/Scripts/Mobiles/Monsters/Ore Elementals/DullCopperElemental.cs +++ b/Scripts/Mobiles/Monsters/Ore Elementals/DullCopperElemental.cs @@ -58,7 +58,7 @@ namespace Server.Mobiles public override bool AutoDispel => true; public override bool BleedImmune => true; - public override int TreasureMapLevel{ get{ return 1; } } + public override int TreasureMapLevel => 1; public DullCopperElemental( Serial serial ) : base( serial ) { diff --git a/Scripts/Mobiles/Monsters/Ore Elementals/GoldenElemental.cs b/Scripts/Mobiles/Monsters/Ore Elementals/GoldenElemental.cs index 6f9583603..a03561b07 100644 --- a/Scripts/Mobiles/Monsters/Ore Elementals/GoldenElemental.cs +++ b/Scripts/Mobiles/Monsters/Ore Elementals/GoldenElemental.cs @@ -58,7 +58,7 @@ namespace Server.Mobiles public override bool AutoDispel => true; public override bool BleedImmune => true; - public override int TreasureMapLevel{ get{ return 1; } } + public override int TreasureMapLevel => 1; public GoldenElemental( Serial serial ) : base( serial ) { diff --git a/Scripts/Mobiles/Monsters/Ore Elementals/ShadowIronElemental.cs b/Scripts/Mobiles/Monsters/Ore Elementals/ShadowIronElemental.cs index 3d09b6264..b329af048 100644 --- a/Scripts/Mobiles/Monsters/Ore Elementals/ShadowIronElemental.cs +++ b/Scripts/Mobiles/Monsters/Ore Elementals/ShadowIronElemental.cs @@ -58,7 +58,7 @@ namespace Server.Mobiles public override bool AutoDispel => true; public override bool BleedImmune => true; - public override int TreasureMapLevel{ get{ return 1; } } + public override int TreasureMapLevel => 1; public override Poison PoisonImmune => Poison.Deadly; public override bool BreathImmune => true; diff --git a/Scripts/Mobiles/Monsters/Ore Elementals/ValoriteElemental.cs b/Scripts/Mobiles/Monsters/Ore Elementals/ValoriteElemental.cs index e0b7ef6a2..8b1d32f7a 100644 --- a/Scripts/Mobiles/Monsters/Ore Elementals/ValoriteElemental.cs +++ b/Scripts/Mobiles/Monsters/Ore Elementals/ValoriteElemental.cs @@ -62,7 +62,7 @@ namespace Server.Mobiles public override bool AutoDispel => true; public override bool BleedImmune => true; - public override int TreasureMapLevel{ get{ return 1; } } + public override int TreasureMapLevel => 1; public override void AlterMeleeDamageFrom( Mobile from, ref int damage ) { diff --git a/Scripts/Mobiles/Monsters/Ore Elementals/VeriteElemental.cs b/Scripts/Mobiles/Monsters/Ore Elementals/VeriteElemental.cs index a4c322f65..e3c18a831 100644 --- a/Scripts/Mobiles/Monsters/Ore Elementals/VeriteElemental.cs +++ b/Scripts/Mobiles/Monsters/Ore Elementals/VeriteElemental.cs @@ -59,7 +59,7 @@ namespace Server.Mobiles public override bool AutoDispel => true; public override bool BleedImmune => true; - public override int TreasureMapLevel{ get{ return 1; } } + public override int TreasureMapLevel => 1; public VeriteElemental( Serial serial ) : base( serial ) { diff --git a/Scripts/Mobiles/Monsters/Plant/Magic/Reaper.cs b/Scripts/Mobiles/Monsters/Plant/Magic/Reaper.cs index c846d5bc8..51b6b9ce1 100644 --- a/Scripts/Mobiles/Monsters/Plant/Magic/Reaper.cs +++ b/Scripts/Mobiles/Monsters/Plant/Magic/Reaper.cs @@ -54,7 +54,7 @@ namespace Server.Mobiles } public override Poison PoisonImmune => Poison.Greater; - public override int TreasureMapLevel{ get{ return 2; } } + public override int TreasureMapLevel => 2; public override bool DisallowAllMoves => true; public Reaper( Serial serial ) : base( serial ) diff --git a/Scripts/Mobiles/Monsters/Plant/Melee/BogThing.cs b/Scripts/Mobiles/Monsters/Plant/Melee/BogThing.cs index fdc58c8e4..39df6db9d 100644 --- a/Scripts/Mobiles/Monsters/Plant/Melee/BogThing.cs +++ b/Scripts/Mobiles/Monsters/Plant/Melee/BogThing.cs @@ -7,7 +7,7 @@ namespace Server.Mobiles [CorpseName( "a plant corpse" )] public class BogThing : BaseCreature { - public override string DefaultName { get { return "a bog thing"; } } + public override string DefaultName => "a bog thing"; [Constructible] public BogThing() : base( AIType.AI_Melee, FightMode.Closest, 10, 1, 0.6, 1.2 ) diff --git a/Scripts/Mobiles/Monsters/Plant/Melee/Bogling.cs b/Scripts/Mobiles/Monsters/Plant/Melee/Bogling.cs index 7e3084df2..ab5d1b220 100644 --- a/Scripts/Mobiles/Monsters/Plant/Melee/Bogling.cs +++ b/Scripts/Mobiles/Monsters/Plant/Melee/Bogling.cs @@ -6,7 +6,7 @@ namespace Server.Mobiles [CorpseName( "a plant corpse" )] public class Bogling : BaseCreature { - public override string DefaultName { get { return "a bogling"; } } + public override string DefaultName => "a bogling"; [Constructible] public Bogling() : base( AIType.AI_Melee, FightMode.Closest, 10, 1, 0.2, 0.4 ) @@ -48,8 +48,8 @@ namespace Server.Mobiles AddLoot( LootPack.Meager ); } - public override int Hides{ get{ return 6; } } - public override int Meat{ get{ return 1; } } + public override int Hides => 6; + public override int Meat => 1; public Bogling( Serial serial ) : base( serial ) { @@ -67,4 +67,4 @@ namespace Server.Mobiles int version = reader.ReadInt(); } } -} \ No newline at end of file +} diff --git a/Scripts/Mobiles/Monsters/Plant/Melee/Corpser.cs b/Scripts/Mobiles/Monsters/Plant/Melee/Corpser.cs index 363cb8369..e421511bf 100644 --- a/Scripts/Mobiles/Monsters/Plant/Melee/Corpser.cs +++ b/Scripts/Mobiles/Monsters/Plant/Melee/Corpser.cs @@ -8,7 +8,7 @@ namespace Server.Mobiles [CorpseName( "a corpser corpse" )] public class Corpser : BaseCreature { - public override string DefaultName { get { return "a corpser"; } } + public override string DefaultName => "a corpser"; [Constructible] public Corpser() : base( AIType.AI_Melee, FightMode.Closest, 10, 1, 0.2, 0.4 ) diff --git a/Scripts/Mobiles/Monsters/Plant/Melee/Quagmire.cs b/Scripts/Mobiles/Monsters/Plant/Melee/Quagmire.cs index 4b0729627..d70e5b354 100644 --- a/Scripts/Mobiles/Monsters/Plant/Melee/Quagmire.cs +++ b/Scripts/Mobiles/Monsters/Plant/Melee/Quagmire.cs @@ -53,7 +53,7 @@ namespace Server.Mobiles public override Poison PoisonImmune => Poison.Lethal; public override Poison HitPoison => Poison.Lethal; - public override double HitPoisonChance{ get{ return 0.1; } } + public override double HitPoisonChance => 0.1; public Quagmire( Serial serial ) : base( serial ) { diff --git a/Scripts/Mobiles/Monsters/Reptile/Magic/AncientWyrm.cs b/Scripts/Mobiles/Monsters/Reptile/Magic/AncientWyrm.cs index 1dabd1702..a05cf94e8 100644 --- a/Scripts/Mobiles/Monsters/Reptile/Magic/AncientWyrm.cs +++ b/Scripts/Mobiles/Monsters/Reptile/Magic/AncientWyrm.cs @@ -7,7 +7,7 @@ namespace Server.Mobiles [CorpseName( "a dragon corpse" )] public class AncientWyrm : BaseCreature { - public override string DefaultName { get { return "an ancient wyrm"; } } + public override string DefaultName => "an ancient wyrm"; [Constructible] public AncientWyrm () : base( AIType.AI_Mage, FightMode.Closest, 10, 1, 0.2, 0.4 ) @@ -64,14 +64,14 @@ namespace Server.Mobiles public override bool ReacquireOnMovement => true; public override bool HasBreath => true; // fire breath enabled public override bool AutoDispel => true; - public override HideType HideType{ get{ return HideType.Barbed; } } - public override int Hides{ get{ return 40; } } - public override int Meat{ get{ return 19; } } - public override int Scales{ get{ return 12; } } - public override ScaleType ScaleType{ get{ return (ScaleType)Utility.Random( 4 ); } } + public override HideType HideType => HideType.Barbed; + public override int Hides => 40; + public override int Meat => 19; + public override int Scales => 12; + public override ScaleType ScaleType => (ScaleType)Utility.Random( 4 ); public override Poison PoisonImmune => Poison.Regular; public override Poison HitPoison => Utility.RandomBool() ? Poison.Lesser : Poison.Regular; - public override int TreasureMapLevel{ get{ return 5; } } + public override int TreasureMapLevel => 5; public override bool CanFly => true; public AncientWyrm( Serial serial ) : base( serial ) diff --git a/Scripts/Mobiles/Monsters/Reptile/Magic/DeepSeaSerpent.cs b/Scripts/Mobiles/Monsters/Reptile/Magic/DeepSeaSerpent.cs index 0b3929de5..34c2cd3ec 100644 --- a/Scripts/Mobiles/Monsters/Reptile/Magic/DeepSeaSerpent.cs +++ b/Scripts/Mobiles/Monsters/Reptile/Magic/DeepSeaSerpent.cs @@ -7,7 +7,7 @@ namespace Server.Mobiles [CorpseName( "a deep sea serpents corpse" )] public class DeepSeaSerpent : BaseCreature { - public override string DefaultName { get { return "a deep sea serpent"; } } + public override string DefaultName => "a deep sea serpent"; [Constructible] public DeepSeaSerpent() : base( AIType.AI_Mage, FightMode.Closest, 10, 1, 0.2, 0.4 ) @@ -58,9 +58,9 @@ namespace Server.Mobiles } public override bool HasBreath => true; - public override int Meat{ get{ return 1; } } - public override int Scales{ get{ return 8; } } - public override ScaleType ScaleType{ get{ return ScaleType.Blue; } } + public override int Meat => 1; + public override int Scales => 8; + public override ScaleType ScaleType => ScaleType.Blue; public DeepSeaSerpent( Serial serial ) : base( serial ) { diff --git a/Scripts/Mobiles/Monsters/Reptile/Magic/Dragon.cs b/Scripts/Mobiles/Monsters/Reptile/Magic/Dragon.cs index fd1d027a8..05e2ccb84 100644 --- a/Scripts/Mobiles/Monsters/Reptile/Magic/Dragon.cs +++ b/Scripts/Mobiles/Monsters/Reptile/Magic/Dragon.cs @@ -56,13 +56,13 @@ namespace Server.Mobiles public override bool ReacquireOnMovement => !Controlled; public override bool HasBreath => true; // fire breath enabled public override bool AutoDispel => !Controlled; - public override int TreasureMapLevel{ get{ return 4; } } - public override int Meat{ get{ return 19; } } - public override int Hides{ get{ return 20; } } - public override HideType HideType{ get{ return HideType.Barbed; } } - public override int Scales{ get{ return 7; } } - public override ScaleType ScaleType{ get{ return ( Body == 12 ? ScaleType.Yellow : ScaleType.Red ); } } - public override FoodType FavoriteFood{ get{ return FoodType.Meat; } } + public override int TreasureMapLevel => 4; + public override int Meat => 19; + public override int Hides => 20; + public override HideType HideType => HideType.Barbed; + public override int Scales => 7; + public override ScaleType ScaleType => ( Body == 12 ? ScaleType.Yellow : ScaleType.Red ); + public override FoodType FavoriteFood => FoodType.Meat; public override bool CanAngerOnTame => true; public override bool CanFly => true; diff --git a/Scripts/Mobiles/Monsters/Reptile/Magic/Leviathan.cs b/Scripts/Mobiles/Monsters/Reptile/Magic/Leviathan.cs index 424409b87..8ccf7ba5a 100644 --- a/Scripts/Mobiles/Monsters/Reptile/Magic/Leviathan.cs +++ b/Scripts/Mobiles/Monsters/Reptile/Magic/Leviathan.cs @@ -78,21 +78,21 @@ namespace Server.Mobiles } public override bool HasBreath => true; - public override int BreathPhysicalDamage{ get{ return 70; } } // TODO: Verify damage type - public override int BreathColdDamage{ get{ return 30; } } - public override int BreathFireDamage{ get{ return 0; } } - public override int BreathEffectHue{ get{ return 0x1ED; } } - public override double BreathDamageScalar{ get{ return 0.05; } } - public override double BreathMinDelay{ get{ return 5.0; } } - public override double BreathMaxDelay{ get{ return 7.5; } } + public override int BreathPhysicalDamage => 70; // TODO: Verify damage type + public override int BreathColdDamage => 30; + public override int BreathFireDamage => 0; + public override int BreathEffectHue => 0x1ED; + public override double BreathDamageScalar => 0.05; + public override double BreathMinDelay => 5.0; + public override double BreathMaxDelay => 7.5; public override void GenerateLoot() { AddLoot( LootPack.FilthyRich, 5 ); } - public override double TreasureMapChance{ get{ return 0.25; } } - public override int TreasureMapLevel{ get{ return 5; } } + public override double TreasureMapChance => 0.25; + public override int TreasureMapLevel => 5; public Leviathan( Serial serial ) : base( serial ) { @@ -112,7 +112,7 @@ namespace Server.Mobiles int version = reader.ReadInt(); } - public static Type[] Artifacts { get { return m_Artifacts; } } + public static Type[] Artifacts => m_Artifacts; private static Type[] m_Artifacts = new Type[] { diff --git a/Scripts/Mobiles/Monsters/Reptile/Magic/OphidianArchmage.cs b/Scripts/Mobiles/Monsters/Reptile/Magic/OphidianArchmage.cs index 3de026985..50d586830 100644 --- a/Scripts/Mobiles/Monsters/Reptile/Magic/OphidianArchmage.cs +++ b/Scripts/Mobiles/Monsters/Reptile/Magic/OphidianArchmage.cs @@ -59,7 +59,7 @@ namespace Server.Mobiles AddLoot( LootPack.MedScrolls, 2 ); } - public override int Meat{ get{ return 1; } } + public override int Meat => 1; public override OppositionGroup OppositionGroup { @@ -82,4 +82,4 @@ namespace Server.Mobiles int version = reader.ReadInt(); } } -} \ No newline at end of file +} diff --git a/Scripts/Mobiles/Monsters/Reptile/Magic/OphidianMage.cs b/Scripts/Mobiles/Monsters/Reptile/Magic/OphidianMage.cs index 775b720d6..575335b01 100644 --- a/Scripts/Mobiles/Monsters/Reptile/Magic/OphidianMage.cs +++ b/Scripts/Mobiles/Monsters/Reptile/Magic/OphidianMage.cs @@ -59,8 +59,8 @@ namespace Server.Mobiles AddLoot( LootPack.Potions ); } - public override int Meat{ get{ return 1; } } - public override int TreasureMapLevel{ get{ return 2; } } + public override int Meat => 1; + public override int TreasureMapLevel => 2; public override OppositionGroup OppositionGroup { @@ -83,4 +83,4 @@ namespace Server.Mobiles int version = reader.ReadInt(); } } -} \ No newline at end of file +} diff --git a/Scripts/Mobiles/Monsters/Reptile/Magic/OphidianMatriarch.cs b/Scripts/Mobiles/Monsters/Reptile/Magic/OphidianMatriarch.cs index b98bfed3e..deb3122bc 100644 --- a/Scripts/Mobiles/Monsters/Reptile/Magic/OphidianMatriarch.cs +++ b/Scripts/Mobiles/Monsters/Reptile/Magic/OphidianMatriarch.cs @@ -52,7 +52,7 @@ namespace Server.Mobiles } public override Poison PoisonImmune => Poison.Greater; - public override int TreasureMapLevel{ get{ return 4; } } + public override int TreasureMapLevel => 4; public override OppositionGroup OppositionGroup { diff --git a/Scripts/Mobiles/Monsters/Reptile/Magic/SeaSerpent.cs b/Scripts/Mobiles/Monsters/Reptile/Magic/SeaSerpent.cs index 4fff4fce8..f09426464 100644 --- a/Scripts/Mobiles/Monsters/Reptile/Magic/SeaSerpent.cs +++ b/Scripts/Mobiles/Monsters/Reptile/Magic/SeaSerpent.cs @@ -61,12 +61,12 @@ namespace Server.Mobiles } public override bool HasBreath => true; - public override int TreasureMapLevel{ get{ return 2; } } + public override int TreasureMapLevel => 2; - public override int Hides{ get{ return 10; } } - public override HideType HideType{ get{ return HideType.Horned; } } - public override int Scales{ get{ return 8; } } - public override ScaleType ScaleType{ get{ return ScaleType.Blue; } } + public override int Hides => 10; + public override HideType HideType => HideType.Horned; + public override int Scales => 8; + public override ScaleType ScaleType => ScaleType.Blue; public SeaSerpent( Serial serial ) : base( serial ) { diff --git a/Scripts/Mobiles/Monsters/Reptile/Magic/SerpentineDragon.cs b/Scripts/Mobiles/Monsters/Reptile/Magic/SerpentineDragon.cs index 3174b672d..083727c3f 100644 --- a/Scripts/Mobiles/Monsters/Reptile/Magic/SerpentineDragon.cs +++ b/Scripts/Mobiles/Monsters/Reptile/Magic/SerpentineDragon.cs @@ -81,15 +81,15 @@ namespace Server.Mobiles public override bool ReacquireOnMovement => true; public override bool HasBreath => true; // fire breath enabled - public override double BonusPetDamageScalar{ get{ return (Core.SE) ? 3.0 : 1.0; } } + public override double BonusPetDamageScalar => (Core.SE) ? 3.0 : 1.0; public override bool AutoDispel => true; - public override HideType HideType{ get{ return HideType.Barbed; } } - public override int Hides{ get{ return 20; } } - public override int Meat{ get{ return 19; } } - public override int Scales{ get{ return 6; } } - public override ScaleType ScaleType{ get{ return ( Utility.RandomBool() ? ScaleType.Black : ScaleType.White ); } } - public override int TreasureMapLevel{ get{ return 4; } } + public override HideType HideType => HideType.Barbed; + public override int Hides => 20; + public override int Meat => 19; + public override int Scales => 6; + public override ScaleType ScaleType => ( Utility.RandomBool() ? ScaleType.Black : ScaleType.White ); + public override int TreasureMapLevel => 4; public SerpentineDragon( Serial serial ) : base( serial ) { diff --git a/Scripts/Mobiles/Monsters/Reptile/Magic/ShadowWyrm.cs b/Scripts/Mobiles/Monsters/Reptile/Magic/ShadowWyrm.cs index 36f6e97a1..23a19c8c0 100644 --- a/Scripts/Mobiles/Monsters/Reptile/Magic/ShadowWyrm.cs +++ b/Scripts/Mobiles/Monsters/Reptile/Magic/ShadowWyrm.cs @@ -66,13 +66,13 @@ namespace Server.Mobiles public override bool AutoDispel => true; public override Poison PoisonImmune => Poison.Deadly; public override Poison HitPoison => Poison.Deadly; - public override int TreasureMapLevel{ get{ return 5; } } + public override int TreasureMapLevel => 5; - public override int Meat{ get{ return 19; } } - public override int Hides{ get{ return 20; } } - public override int Scales{ get{ return 10; } } - public override ScaleType ScaleType{ get{ return ScaleType.Black; } } - public override HideType HideType{ get{ return HideType.Barbed; } } + public override int Meat => 19; + public override int Hides => 20; + public override int Scales => 10; + public override ScaleType ScaleType => ScaleType.Black; + public override HideType HideType => HideType.Barbed; public override bool CanFly => true; public ShadowWyrm( Serial serial ) : base( serial ) diff --git a/Scripts/Mobiles/Monsters/Reptile/Magic/SkeletalDragon.cs b/Scripts/Mobiles/Monsters/Reptile/Magic/SkeletalDragon.cs index b3816d8e1..78fa2f9d8 100644 --- a/Scripts/Mobiles/Monsters/Reptile/Magic/SkeletalDragon.cs +++ b/Scripts/Mobiles/Monsters/Reptile/Magic/SkeletalDragon.cs @@ -54,18 +54,18 @@ namespace Server.Mobiles public override bool ReacquireOnMovement => true; public override bool HasBreath => true; // fire breath enabled - public override int BreathFireDamage{ get{ return 0; } } - public override int BreathColdDamage{ get{ return 100; } } - public override int BreathEffectHue{ get{ return 0x480; } } - public override double BonusPetDamageScalar{ get{ return (Core.SE)? 3.0 : 1.0; } } + public override int BreathFireDamage => 0; + public override int BreathColdDamage => 100; + public override int BreathEffectHue => 0x480; + public override double BonusPetDamageScalar => (Core.SE)? 3.0 : 1.0; // TODO: Undead summoning? public override bool AutoDispel => true; public override Poison PoisonImmune => Poison.Lethal; public override bool BleedImmune => true; - public override int Meat{ get{ return 19; } } // where's it hiding these? :) - public override int Hides{ get{ return 20; } } - public override HideType HideType{ get{ return HideType.Barbed; } } + public override int Meat => 19; // where's it hiding these? :) + public override int Hides => 20; + public override HideType HideType => HideType.Barbed; public SkeletalDragon( Serial serial ) : base( serial ) { diff --git a/Scripts/Mobiles/Monsters/Reptile/Magic/WhiteWyrm.cs b/Scripts/Mobiles/Monsters/Reptile/Magic/WhiteWyrm.cs index 24d31b408..54d023a48 100644 --- a/Scripts/Mobiles/Monsters/Reptile/Magic/WhiteWyrm.cs +++ b/Scripts/Mobiles/Monsters/Reptile/Magic/WhiteWyrm.cs @@ -56,13 +56,13 @@ namespace Server.Mobiles } public override bool ReacquireOnMovement => true; - public override int TreasureMapLevel{ get{ return 4; } } - public override int Meat{ get{ return 19; } } - public override int Hides{ get{ return 20; } } - public override HideType HideType{ get{ return HideType.Barbed; } } - public override int Scales{ get{ return 9; } } - public override ScaleType ScaleType{ get{ return ScaleType.White; } } - public override FoodType FavoriteFood{ get{ return FoodType.Meat | FoodType.Gold; } } + public override int TreasureMapLevel => 4; + public override int Meat => 19; + public override int Hides => 20; + public override HideType HideType => HideType.Barbed; + public override int Scales => 9; + public override ScaleType ScaleType => ScaleType.White; + public override FoodType FavoriteFood => FoodType.Meat | FoodType.Gold; public override bool CanAngerOnTame => true; public override bool CanFly => true; diff --git a/Scripts/Mobiles/Monsters/Reptile/Melee/Drake.cs b/Scripts/Mobiles/Monsters/Reptile/Melee/Drake.cs index a1d57b18b..fbc4ae296 100644 --- a/Scripts/Mobiles/Monsters/Reptile/Melee/Drake.cs +++ b/Scripts/Mobiles/Monsters/Reptile/Melee/Drake.cs @@ -56,13 +56,13 @@ namespace Server.Mobiles public override bool ReacquireOnMovement => true; public override bool HasBreath => true; // fire breath enabled - public override int TreasureMapLevel{ get{ return 2; } } - public override int Meat{ get{ return 10; } } - public override int Hides{ get{ return 20; } } - public override HideType HideType{ get{ return HideType.Horned; } } - public override int Scales{ get{ return 2; } } - public override ScaleType ScaleType{ get{ return ( Body == 60 ? ScaleType.Yellow : ScaleType.Red ); } } - public override FoodType FavoriteFood{ get{ return FoodType.Meat | FoodType.Fish; } } + public override int TreasureMapLevel => 2; + public override int Meat => 10; + public override int Hides => 20; + public override HideType HideType => HideType.Horned; + public override int Scales => 2; + public override ScaleType ScaleType => ( Body == 60 ? ScaleType.Yellow : ScaleType.Red ); + public override FoodType FavoriteFood => FoodType.Meat | FoodType.Fish; public override bool CanFly => true; public Drake( Serial serial ) : base( serial ) diff --git a/Scripts/Mobiles/Monsters/Reptile/Melee/Harpy.cs b/Scripts/Mobiles/Monsters/Reptile/Melee/Harpy.cs index 5299f9821..94bb31b4f 100644 --- a/Scripts/Mobiles/Monsters/Reptile/Melee/Harpy.cs +++ b/Scripts/Mobiles/Monsters/Reptile/Melee/Harpy.cs @@ -72,9 +72,9 @@ namespace Server.Mobiles } public override bool CanRummageCorpses => true; - public override int Meat{ get{ return 4; } } - public override MeatType MeatType{ get{ return MeatType.Bird; } } - public override int Feathers{ get{ return 50; } } + public override int Meat => 4; + public override MeatType MeatType => MeatType.Bird; + public override int Feathers => 50; public override bool CanFly => true; public Harpy( Serial serial ) : base( serial ) diff --git a/Scripts/Mobiles/Monsters/Reptile/Melee/Kraken.cs b/Scripts/Mobiles/Monsters/Reptile/Melee/Kraken.cs index 8e4e3c232..a04cdfc9d 100644 --- a/Scripts/Mobiles/Monsters/Reptile/Melee/Kraken.cs +++ b/Scripts/Mobiles/Monsters/Reptile/Melee/Kraken.cs @@ -61,7 +61,7 @@ namespace Server.Mobiles AddLoot( LootPack.Rich ); } - public override int TreasureMapLevel{ get{ return 4; } } + public override int TreasureMapLevel => 4; public Kraken( Serial serial ) : base( serial ) { diff --git a/Scripts/Mobiles/Monsters/Reptile/Melee/Lizardman.cs b/Scripts/Mobiles/Monsters/Reptile/Melee/Lizardman.cs index e2688898d..713aced3b 100644 --- a/Scripts/Mobiles/Monsters/Reptile/Melee/Lizardman.cs +++ b/Scripts/Mobiles/Monsters/Reptile/Melee/Lizardman.cs @@ -9,7 +9,7 @@ namespace Server.Mobiles [CorpseName( "a lizardman corpse" )] public class Lizardman : BaseCreature { - public override InhumanSpeech SpeechType{ get{ return InhumanSpeech.Lizardman; } } + public override InhumanSpeech SpeechType => InhumanSpeech.Lizardman; [Constructible] public Lizardman() : base( AIType.AI_Melee, FightMode.Closest, 10, 1, 0.2, 0.4 ) @@ -50,9 +50,9 @@ namespace Server.Mobiles } public override bool CanRummageCorpses => true; - public override int Meat{ get{ return 1; } } - public override int Hides{ get{ return 12; } } - public override HideType HideType{ get{ return HideType.Spined; } } + public override int Meat => 1; + public override int Hides => 12; + public override HideType HideType => HideType.Spined; public Lizardman( Serial serial ) : base( serial ) { diff --git a/Scripts/Mobiles/Monsters/Reptile/Melee/OphidianKnight.cs b/Scripts/Mobiles/Monsters/Reptile/Melee/OphidianKnight.cs index e6b0e8335..00b9ebacc 100644 --- a/Scripts/Mobiles/Monsters/Reptile/Melee/OphidianKnight.cs +++ b/Scripts/Mobiles/Monsters/Reptile/Melee/OphidianKnight.cs @@ -57,11 +57,11 @@ namespace Server.Mobiles AddLoot( LootPack.Rich, 2 ); } - public override int Meat{ get{ return 2; } } + public override int Meat => 2; public override Poison PoisonImmune => Poison.Lethal; public override Poison HitPoison => Poison.Lethal; - public override int TreasureMapLevel{ get{ return 3; } } + public override int TreasureMapLevel => 3; public override OppositionGroup OppositionGroup { diff --git a/Scripts/Mobiles/Monsters/Reptile/Melee/OphidianWarrior.cs b/Scripts/Mobiles/Monsters/Reptile/Melee/OphidianWarrior.cs index 986371af0..a981460f1 100644 --- a/Scripts/Mobiles/Monsters/Reptile/Melee/OphidianWarrior.cs +++ b/Scripts/Mobiles/Monsters/Reptile/Melee/OphidianWarrior.cs @@ -55,8 +55,8 @@ namespace Server.Mobiles AddLoot( LootPack.Gems ); } - public override int Meat{ get{ return 1; } } - public override int TreasureMapLevel{ get{ return 1; } } + public override int Meat => 1; + public override int TreasureMapLevel => 1; public override OppositionGroup OppositionGroup { @@ -79,4 +79,4 @@ namespace Server.Mobiles int version = reader.ReadInt(); } } -} \ No newline at end of file +} diff --git a/Scripts/Mobiles/Monsters/Reptile/Melee/Scorpion.cs b/Scripts/Mobiles/Monsters/Reptile/Melee/Scorpion.cs index 01eeff370..c23b93d0c 100644 --- a/Scripts/Mobiles/Monsters/Reptile/Melee/Scorpion.cs +++ b/Scripts/Mobiles/Monsters/Reptile/Melee/Scorpion.cs @@ -56,9 +56,9 @@ namespace Server.Mobiles AddLoot( LootPack.Meager ); } - public override int Meat{ get{ return 1; } } - public override FoodType FavoriteFood{ get{ return FoodType.Meat; } } - public override PackInstinct PackInstinct{ get{ return PackInstinct.Arachnid; } } + public override int Meat => 1; + public override FoodType FavoriteFood => FoodType.Meat; + public override PackInstinct PackInstinct => PackInstinct.Arachnid; public override Poison PoisonImmune => Poison.Greater; public override Poison HitPoison => (0.8 >= Utility.RandomDouble() ? Poison.Greater : Poison.Deadly); diff --git a/Scripts/Mobiles/Monsters/Reptile/Melee/StoneHarpy.cs b/Scripts/Mobiles/Monsters/Reptile/Melee/StoneHarpy.cs index 41415eb2e..f7c8f2e14 100644 --- a/Scripts/Mobiles/Monsters/Reptile/Melee/StoneHarpy.cs +++ b/Scripts/Mobiles/Monsters/Reptile/Melee/StoneHarpy.cs @@ -75,8 +75,8 @@ namespace Server.Mobiles return 918; } - public override int Meat{ get{ return 1; } } - public override int Feathers{ get{ return 50; } } + public override int Meat => 1; + public override int Feathers => 50; public override bool CanFly => true; public StoneHarpy( Serial serial ) : base( serial ) diff --git a/Scripts/Mobiles/Monsters/Reptile/Melee/Wyvern.cs b/Scripts/Mobiles/Monsters/Reptile/Melee/Wyvern.cs index e5bb20d50..3ea9dd7c3 100644 --- a/Scripts/Mobiles/Monsters/Reptile/Melee/Wyvern.cs +++ b/Scripts/Mobiles/Monsters/Reptile/Melee/Wyvern.cs @@ -55,11 +55,11 @@ namespace Server.Mobiles public override Poison PoisonImmune => Poison.Deadly; public override Poison HitPoison => Poison.Deadly; - public override int TreasureMapLevel{ get{ return 2; } } + public override int TreasureMapLevel => 2; - public override int Meat{ get{ return 10; } } - public override int Hides{ get{ return 20; } } - public override HideType HideType{ get{ return HideType.Horned; } } + public override int Meat => 10; + public override int Hides => 20; + public override HideType HideType => HideType.Horned; public override bool CanFly => true; public override int GetAttackSound() diff --git a/Scripts/Mobiles/Monsters/SE/BakeKitsune.cs b/Scripts/Mobiles/Monsters/SE/BakeKitsune.cs index e2db96a41..3e42b56c4 100644 --- a/Scripts/Mobiles/Monsters/SE/BakeKitsune.cs +++ b/Scripts/Mobiles/Monsters/SE/BakeKitsune.cs @@ -56,10 +56,10 @@ namespace Server.Mobiles AddLoot( LootPack.MedScrolls, 2 ); } - public override int Meat{ get{ return 5; } } - public override int Hides{ get{ return 10; } } - public override HideType HideType{ get{ return HideType.Barbed; } } - public override FoodType FavoriteFood{ get{ return FoodType.Fish; } } + public override int Meat => 5; + public override int Hides => 10; + public override HideType HideType => HideType.Barbed; + public override FoodType FavoriteFood => FoodType.Fish; public override bool ShowFameTitle => false; public override bool ClickTitle => false; public override bool PropertyTitle => false; diff --git a/Scripts/Mobiles/Monsters/SE/DeathWatchBeetle.cs b/Scripts/Mobiles/Monsters/SE/DeathWatchBeetle.cs index 018d7d8b0..d0f53d5fe 100644 --- a/Scripts/Mobiles/Monsters/SE/DeathWatchBeetle.cs +++ b/Scripts/Mobiles/Monsters/SE/DeathWatchBeetle.cs @@ -11,10 +11,10 @@ namespace Server.Mobiles { public override WeaponAbility GetWeaponAbility() => WeaponAbility.CrushingBlow; - public override string DefaultName { get { return "a deathwatch beetle"; } } + public override string DefaultName => "a deathwatch beetle"; [Constructible] - public DeathwatchBeetle() : base( AIType.AI_Melee, Core.ML ? FightMode.Aggressor : FightMode.Closest, 10, 1, 0.2, 0.4 ) + public DeathwatchBeetle() : base( AIType.AI_Melee, Core.ML ? FightMode.Aggressor : FightMode.Closest, 10, 1, 0.2, 0.4 ) { Body = 242; @@ -125,7 +125,7 @@ namespace Server.Mobiles m.SendLocalizedMessage( 1070821, this.Name ); // %s spits a poisonous substance at you! } - public override int Hides{ get{ return 8; } } + public override int Hides => 8; public DeathwatchBeetle( Serial serial ) : base( serial ) { } @@ -142,4 +142,4 @@ namespace Server.Mobiles int version = reader.ReadInt(); } } -} \ No newline at end of file +} diff --git a/Scripts/Mobiles/Monsters/SE/DeathWatchBeetleHatchling.cs b/Scripts/Mobiles/Monsters/SE/DeathWatchBeetleHatchling.cs index 9e3fcfcea..b386b13b2 100644 --- a/Scripts/Mobiles/Monsters/SE/DeathWatchBeetleHatchling.cs +++ b/Scripts/Mobiles/Monsters/SE/DeathWatchBeetleHatchling.cs @@ -8,7 +8,7 @@ namespace Server.Mobiles [TypeAlias( "Server.Mobiles.DeathWatchBeetleHatchling" )] public class DeathwatchBeetleHatchling : BaseCreature { - public override string DefaultName { get { return "a deathwatch beetle hatchling"; } } + public override string DefaultName => "a deathwatch beetle hatchling"; [Constructible] public DeathwatchBeetleHatchling() : base( AIType.AI_Melee, Core.ML ? FightMode.Aggressor : FightMode.Closest, 10, 1, 0.2, 0.4 ) @@ -47,7 +47,7 @@ namespace Server.Mobiles i.Amount = 3; PackItem( i ); } - + switch ( Utility.Random( 12 ) ) { case 0: PackItem( new LeatherGorget() ); break; @@ -93,7 +93,7 @@ namespace Server.Mobiles public DeathwatchBeetleHatchling( Serial serial ) : base( serial ) { } - public override int Hides{ get{ return 8; } } + public override int Hides => 8; public override void Serialize( GenericWriter writer ) { base.Serialize( writer ); @@ -106,4 +106,4 @@ namespace Server.Mobiles int version = reader.ReadInt(); } } -} \ No newline at end of file +} diff --git a/Scripts/Mobiles/Monsters/SE/FireBeetle.cs b/Scripts/Mobiles/Monsters/SE/FireBeetle.cs index d129aec24..41f310a2f 100644 --- a/Scripts/Mobiles/Monsters/SE/FireBeetle.cs +++ b/Scripts/Mobiles/Monsters/SE/FireBeetle.cs @@ -93,8 +93,8 @@ namespace Server.Mobiles } - public override int Meat{ get{ return 16; } } - public override FoodType FavoriteFood{ get{ return FoodType.Meat; } } + public override int Meat => 16; + public override FoodType FavoriteFood => FoodType.Meat; public override double GetControlChance( Mobile m, bool useBaseSkill ) { diff --git a/Scripts/Mobiles/Monsters/SE/LadyOfTheSnow.cs b/Scripts/Mobiles/Monsters/SE/LadyOfTheSnow.cs index e25a61a91..23bb6ce22 100644 --- a/Scripts/Mobiles/Monsters/SE/LadyOfTheSnow.cs +++ b/Scripts/Mobiles/Monsters/SE/LadyOfTheSnow.cs @@ -65,7 +65,7 @@ namespace Server.Mobiles public override bool BleedImmune => true; public override bool CanRummageCorpses => true; - public override int TreasureMapLevel { get { return 4; } } + public override int TreasureMapLevel => 4; // TODO: Snowball diff --git a/Scripts/Mobiles/Monsters/SE/Oni.cs b/Scripts/Mobiles/Monsters/SE/Oni.cs index bcc6e10fb..dcf39dce2 100644 --- a/Scripts/Mobiles/Monsters/SE/Oni.cs +++ b/Scripts/Mobiles/Monsters/SE/Oni.cs @@ -80,7 +80,7 @@ namespace Server.Mobiles } public override bool CanRummageCorpses => true; - public override int TreasureMapLevel{ get{ return 4; } } + public override int TreasureMapLevel => 4; /* TODO: Angry Fire * cliloc 1070823 diff --git a/Scripts/Mobiles/Monsters/SE/RuneBeetle.cs b/Scripts/Mobiles/Monsters/SE/RuneBeetle.cs index 0751188b7..24484fc5b 100644 --- a/Scripts/Mobiles/Monsters/SE/RuneBeetle.cs +++ b/Scripts/Mobiles/Monsters/SE/RuneBeetle.cs @@ -102,7 +102,7 @@ namespace Server.Mobiles public override Poison PoisonImmune => Poison.Greater; public override Poison HitPoison => Poison.Greater; - public override FoodType FavoriteFood{ get{ return FoodType.FruitsAndVegies | FoodType.GrainsAndHay; } } + public override FoodType FavoriteFood => FoodType.FruitsAndVegies | FoodType.GrainsAndHay; public override bool CanAngerOnTame => true; public override void OnGaveMeleeAttack( Mobile defender ) diff --git a/Scripts/Mobiles/Monsters/SE/TsukiWolf.cs b/Scripts/Mobiles/Monsters/SE/TsukiWolf.cs index f3880c9f8..b6c252755 100644 --- a/Scripts/Mobiles/Monsters/SE/TsukiWolf.cs +++ b/Scripts/Mobiles/Monsters/SE/TsukiWolf.cs @@ -67,9 +67,9 @@ namespace Server.Mobiles AddLoot( LootPack.Average ); AddLoot( LootPack.Rich ); } - public override int Meat { get { return 4; } } - public override int Hides { get { return 25; } } - public override FoodType FavoriteFood { get { return FoodType.Meat; } } + public override int Meat => 4; + public override int Hides => 25; + public override FoodType FavoriteFood => FoodType.Meat; public override void OnGaveMeleeAttack( Mobile defender ) { diff --git a/Scripts/Mobiles/Monsters/SE/Yamandon.cs b/Scripts/Mobiles/Monsters/SE/Yamandon.cs index 89b292e0f..2f0b90764 100644 --- a/Scripts/Mobiles/Monsters/SE/Yamandon.cs +++ b/Scripts/Mobiles/Monsters/SE/Yamandon.cs @@ -59,8 +59,8 @@ namespace Server.Mobiles public override bool ReacquireOnMovement => true; public override Poison PoisonImmune => Poison.Lethal; public override Poison HitPoison => Utility.RandomBool() ? Poison.Deadly : Poison.Lethal; - public override int TreasureMapLevel{ get{ return 5; } } - public override int Hides{ get{ return 20; } } + public override int TreasureMapLevel => 5; + public override int Hides => 20; public override void OnDamagedBySpell( Mobile attacker ) { diff --git a/Scripts/Mobiles/Monsters/SE/YomotsuElder.cs b/Scripts/Mobiles/Monsters/SE/YomotsuElder.cs index 3abee8f54..73a06508d 100644 --- a/Scripts/Mobiles/Monsters/SE/YomotsuElder.cs +++ b/Scripts/Mobiles/Monsters/SE/YomotsuElder.cs @@ -64,9 +64,9 @@ namespace Server.Mobiles PackItem( Engines.Plants.Seed.RandomBonsaiSeed() ); } - public override FoodType FavoriteFood{ get{ return FoodType.Fish; } } + public override FoodType FavoriteFood => FoodType.Fish; - public override int Meat{ get{ return 1; } } + public override int Meat => 1; @@ -77,7 +77,7 @@ namespace Server.Mobiles } public override bool CanRummageCorpses => true; - public override int TreasureMapLevel{ get{ return 5; } } + public override int TreasureMapLevel => 5; // TODO: Axe Throw diff --git a/Scripts/Mobiles/Monsters/SE/YomotsuPriest.cs b/Scripts/Mobiles/Monsters/SE/YomotsuPriest.cs index 128f648ab..e83facd57 100644 --- a/Scripts/Mobiles/Monsters/SE/YomotsuPriest.cs +++ b/Scripts/Mobiles/Monsters/SE/YomotsuPriest.cs @@ -64,9 +64,9 @@ namespace Server.Mobiles if ( Utility.RandomDouble() < .25 ) PackItem( Engines.Plants.Seed.RandomBonsaiSeed() ); } - public override FoodType FavoriteFood{ get{ return FoodType.Fish; } } + public override FoodType FavoriteFood => FoodType.Fish; - public override int Meat{ get{ return 1; } } + public override int Meat => 1; diff --git a/Scripts/Mobiles/Monsters/SE/YomotsuWarrior.cs b/Scripts/Mobiles/Monsters/SE/YomotsuWarrior.cs index 2ec44c1a5..42993920b 100644 --- a/Scripts/Mobiles/Monsters/SE/YomotsuWarrior.cs +++ b/Scripts/Mobiles/Monsters/SE/YomotsuWarrior.cs @@ -63,9 +63,9 @@ namespace Server.Mobiles } - public override FoodType FavoriteFood{ get{ return FoodType.Fish; } } + public override FoodType FavoriteFood => FoodType.Fish; - public override int Meat{ get{ return 1; } } + public override int Meat => 1; public override void GenerateLoot() { @@ -74,7 +74,7 @@ namespace Server.Mobiles } public override bool CanRummageCorpses => true; - public override int TreasureMapLevel{ get{ return 3; } } + public override int TreasureMapLevel => 3; // TODO: Throwing Dagger diff --git a/Scripts/Mobiles/Monsters/Summons/SummonedAirElemental.cs b/Scripts/Mobiles/Monsters/Summons/SummonedAirElemental.cs index 0dc0dd17a..bd5349654 100644 --- a/Scripts/Mobiles/Monsters/Summons/SummonedAirElemental.cs +++ b/Scripts/Mobiles/Monsters/Summons/SummonedAirElemental.cs @@ -7,8 +7,8 @@ namespace Server.Mobiles [CorpseName( "an air elemental corpse" )] public class SummonedAirElemental : BaseCreature { - public override double DispelDifficulty{ get{ return 117.5; } } - public override double DispelFocus{ get{ return 45.0; } } + public override double DispelDifficulty => 117.5; + public override double DispelFocus => 45.0; public override string DefaultName => "an air elemental"; [Constructible] diff --git a/Scripts/Mobiles/Monsters/Summons/SummonedDaemon.cs b/Scripts/Mobiles/Monsters/Summons/SummonedDaemon.cs index 7dd34fe6e..b96960fc0 100644 --- a/Scripts/Mobiles/Monsters/Summons/SummonedDaemon.cs +++ b/Scripts/Mobiles/Monsters/Summons/SummonedDaemon.cs @@ -7,8 +7,8 @@ namespace Server.Mobiles [CorpseName( "a daemon corpse" )] public class SummonedDaemon : BaseCreature { - public override double DispelDifficulty{ get{ return 125.0; } } - public override double DispelFocus{ get{ return 45.0; } } + public override double DispelDifficulty => 125.0; + public override double DispelFocus => 45.0; [Constructible] public SummonedDaemon () : base( AIType.AI_Mage, FightMode.Closest, 10, 1, 0.2, 0.4 ) diff --git a/Scripts/Mobiles/Monsters/Summons/SummonedEarthElemental.cs b/Scripts/Mobiles/Monsters/Summons/SummonedEarthElemental.cs index 1e470614d..7478cfe96 100644 --- a/Scripts/Mobiles/Monsters/Summons/SummonedEarthElemental.cs +++ b/Scripts/Mobiles/Monsters/Summons/SummonedEarthElemental.cs @@ -8,8 +8,8 @@ namespace Server.Mobiles [CorpseName( "an earth elemental corpse" )] public class SummonedEarthElemental : BaseCreature { - public override double DispelDifficulty{ get{ return 117.5; } } - public override double DispelFocus{ get{ return 45.0; } } + public override double DispelDifficulty => 117.5; + public override double DispelFocus => 45.0; public override string DefaultName => "an earth elemental"; [Constructible] diff --git a/Scripts/Mobiles/Monsters/Summons/SummonedFireElemental.cs b/Scripts/Mobiles/Monsters/Summons/SummonedFireElemental.cs index c532dcb94..e1b5d366b 100644 --- a/Scripts/Mobiles/Monsters/Summons/SummonedFireElemental.cs +++ b/Scripts/Mobiles/Monsters/Summons/SummonedFireElemental.cs @@ -7,8 +7,8 @@ namespace Server.Mobiles [CorpseName( "a fire elemental corpse" )] public class SummonedFireElemental : BaseCreature { - public override double DispelDifficulty{ get{ return 117.5; } } - public override double DispelFocus{ get{ return 45.0; } } + public override double DispelDifficulty => 117.5; + public override double DispelFocus => 45.0; public override string DefaultName => "a fire elemental"; [Constructible] diff --git a/Scripts/Mobiles/Monsters/Summons/SummonedWaterElemental.cs b/Scripts/Mobiles/Monsters/Summons/SummonedWaterElemental.cs index 5db6b4495..a6fbc9acd 100644 --- a/Scripts/Mobiles/Monsters/Summons/SummonedWaterElemental.cs +++ b/Scripts/Mobiles/Monsters/Summons/SummonedWaterElemental.cs @@ -7,8 +7,8 @@ namespace Server.Mobiles [CorpseName( "a water elemental corpse" )] public class SummonedWaterElemental : BaseCreature { - public override double DispelDifficulty{ get{ return 117.5; } } - public override double DispelFocus{ get{ return 45.0; } } + public override double DispelDifficulty => 117.5; + public override double DispelFocus => 45.0; public override string DefaultName => "a water elemental"; [Constructible] diff --git a/Scripts/Mobiles/PlayerMobile.cs b/Scripts/Mobiles/PlayerMobile.cs index d545dc7a3..b29163f3d 100644 --- a/Scripts/Mobiles/PlayerMobile.cs +++ b/Scripts/Mobiles/PlayerMobile.cs @@ -215,7 +215,7 @@ namespace Server.Mobiles } } - public List AutoStabled { get { return m_AutoStabled; } } + public List AutoStabled => m_AutoStabled; public bool NinjaWepCooldown { @@ -826,7 +826,7 @@ namespace Server.Mobiles UpdateResistances(); } - public override int MaxWeight { get { return (((Core.ML && this.Race == Race.Human) ? 100 : 40) + (int)(3.5 * this.Str)); } } + public override int MaxWeight => (((Core.ML && this.Race == Race.Human) ? 100 : 40) + (int)(3.5 * this.Str)); private int m_LastGlobalLight = -1, m_LastPersonalLight = -1; @@ -3281,7 +3281,7 @@ namespace Server.Mobiles get{ return m_PermaFlags; } } - public override int Luck{ get{ return AosAttributes.GetValue( this, AosAttribute.Luck ); } } + public override int Luck => AosAttributes.GetValue( this, AosAttribute.Luck ); public override bool IsHarmfulCriminal( Mobile target ) { @@ -3906,7 +3906,7 @@ namespace Server.Mobiles DisguiseTimers.RemoveTimer( this ); } - public override bool NewGuildDisplay { get { return Server.Guilds.Guild.NewGuildSystem; } } + public override bool NewGuildDisplay => Server.Guilds.Guild.NewGuildSystem; public override void GetProperties( ObjectPropertyList list ) { diff --git a/Scripts/Mobiles/Special/Barracoon.cs b/Scripts/Mobiles/Special/Barracoon.cs index 8f1eb4971..ec634b585 100644 --- a/Scripts/Mobiles/Special/Barracoon.cs +++ b/Scripts/Mobiles/Special/Barracoon.cs @@ -10,16 +10,16 @@ namespace Server.Mobiles { public class Barracoon : BaseChampion { - public override ChampionSkullType SkullType{ get{ return ChampionSkullType.Greed; } } + public override ChampionSkullType SkullType => ChampionSkullType.Greed; - public override Type[] UniqueList{ get{ return new Type[] { typeof( FangOfRactus ) }; } } + public override Type[] UniqueList => new Type[] { typeof( FangOfRactus ) }; public override Type[] SharedList{ get{ return new Type[] { typeof( EmbroideredOakLeafCloak ), typeof( DjinnisRing ), typeof( DetectiveBoots ), typeof( GuantletsOfAnger ) }; } } - public override Type[] DecorativeList{ get{ return new Type[] { typeof( SwampTile ), typeof( MonsterStatuette ) }; } } + public override Type[] DecorativeList => new Type[] { typeof( SwampTile ), typeof( MonsterStatuette ) }; - public override MonsterStatuetteType[] StatueTypes{ get{ return new MonsterStatuetteType[] { MonsterStatuetteType.Slime }; } } + public override MonsterStatuetteType[] StatueTypes => new MonsterStatuetteType[] { MonsterStatuetteType.Slime }; public override string DefaultName => "Barracoon"; @@ -73,7 +73,7 @@ namespace Server.Mobiles public override bool AlwaysMurderer => true; public override bool AutoDispel => true; - public override double AutoDispelChance{ get{ return 1.0; } } + public override double AutoDispelChance => 1.0; public override bool BardImmune => !Core.SE; public override bool Unprovokable => Core.SE; public override bool Uncalmable => Core.SE; diff --git a/Scripts/Mobiles/Special/ChaosGuard.cs b/Scripts/Mobiles/Special/ChaosGuard.cs index a47812c8c..a3d653fa6 100644 --- a/Scripts/Mobiles/Special/ChaosGuard.cs +++ b/Scripts/Mobiles/Special/ChaosGuard.cs @@ -8,10 +8,10 @@ namespace Server.Mobiles { public class ChaosGuard : BaseShieldGuard { - public override int Keyword{ get{ return 0x22; } } // *chaos shield* - public override BaseShield Shield{ get{ return new ChaosShield(); } } - public override int SignupNumber{ get{ return 1007140; } } // Sign up with a guild of chaos if thou art interested. - public override GuildType Type{ get{ return GuildType.Chaos; } } + public override int Keyword => 0x22; // *chaos shield* + public override BaseShield Shield => new ChaosShield(); + public override int SignupNumber => 1007140; // Sign up with a guild of chaos if thou art interested. + public override GuildType Type => GuildType.Chaos; public override bool BardImmune => true; diff --git a/Scripts/Mobiles/Special/DarkGuardian.cs b/Scripts/Mobiles/Special/DarkGuardian.cs index 81eacb33c..991c01d8b 100644 --- a/Scripts/Mobiles/Special/DarkGuardian.cs +++ b/Scripts/Mobiles/Special/DarkGuardian.cs @@ -62,7 +62,7 @@ namespace Server.Mobiles get{ return OppositionGroup.FeyAndUndead; } } - public override int TreasureMapLevel{ get{ return 2; } } + public override int TreasureMapLevel => 2; public override bool BleedImmune => true; public override Poison PoisonImmune => Poison.Lethal; public override bool Unprovokable => true; diff --git a/Scripts/Mobiles/Special/Harrower.cs b/Scripts/Mobiles/Special/Harrower.cs index ff56c0f92..51e69d8a7 100644 --- a/Scripts/Mobiles/Special/Harrower.cs +++ b/Scripts/Mobiles/Special/Harrower.cs @@ -203,10 +203,10 @@ namespace Server.Mobiles } [CommandProperty( AccessLevel.GameMaster )] - public override int HitsMax{ get{ return m_TrueForm ? 65000 : 30000; } } + public override int HitsMax => m_TrueForm ? 65000 : 30000; [CommandProperty( AccessLevel.GameMaster )] - public override int ManaMax{ get{ return 5000; } } + public override int ManaMax => 5000; public Harrower( Serial serial ) : base( serial ) { diff --git a/Scripts/Mobiles/Special/LordOaks.cs b/Scripts/Mobiles/Special/LordOaks.cs index 897acc048..3c9cc94bd 100644 --- a/Scripts/Mobiles/Special/LordOaks.cs +++ b/Scripts/Mobiles/Special/LordOaks.cs @@ -10,9 +10,9 @@ namespace Server.Mobiles private Mobile m_Queen; private bool m_SpawnedQueen; - public override ChampionSkullType SkullType{ get{ return ChampionSkullType.Enlightenment; } } + public override ChampionSkullType SkullType => ChampionSkullType.Enlightenment; - public override Type[] UniqueList{ get{ return new Type[] { typeof( OrcChieftainHelm ) }; } } + public override Type[] UniqueList => new Type[] { typeof( OrcChieftainHelm ) }; public override Type[] SharedList{ get{ return new Type[] { typeof( RoyalGuardSurvivalKnife ), typeof( DjinnisRing ), typeof( LieutenantOfTheBritannianRoyalGuard ), @@ -24,7 +24,7 @@ namespace Server.Mobiles typeof( Pier ), typeof( DirtPatch )}; } } - public override MonsterStatuetteType[] StatueTypes{ get{ return new MonsterStatuetteType[] { }; } } + public override MonsterStatuetteType[] StatueTypes => new MonsterStatuetteType[] { }; public override string DefaultName => "Lord Oaks"; diff --git a/Scripts/Mobiles/Special/Mephitis.cs b/Scripts/Mobiles/Special/Mephitis.cs index a60a7d255..060816824 100644 --- a/Scripts/Mobiles/Special/Mephitis.cs +++ b/Scripts/Mobiles/Special/Mephitis.cs @@ -7,13 +7,13 @@ namespace Server.Mobiles { public class Mephitis : BaseChampion { - public override ChampionSkullType SkullType{ get{ return ChampionSkullType.Venom; } } + public override ChampionSkullType SkullType => ChampionSkullType.Venom; - public override Type[] UniqueList{ get{ return new Type[] { typeof( Calm ) }; } } - public override Type[] SharedList { get { return new Type[] { typeof(OblivionsNeedle), typeof(ANecromancerShroud), typeof(EmbroideredOakLeafCloak), typeof(TheMostKnowledgePerson) }; } } - public override Type[] DecorativeList{ get{ return new Type[] { typeof( Web ), typeof( MonsterStatuette ) }; } } + public override Type[] UniqueList => new Type[] { typeof( Calm ) }; + public override Type[] SharedList => new Type[] { typeof(OblivionsNeedle), typeof(ANecromancerShroud), typeof(EmbroideredOakLeafCloak), typeof(TheMostKnowledgePerson) }; + public override Type[] DecorativeList => new Type[] { typeof( Web ), typeof( MonsterStatuette ) }; - public override MonsterStatuetteType[] StatueTypes{ get{ return new MonsterStatuetteType[] { MonsterStatuetteType.Spider }; } } + public override MonsterStatuetteType[] StatueTypes => new MonsterStatuetteType[] { MonsterStatuetteType.Spider }; public override string DefaultName => "Mephitis"; diff --git a/Scripts/Mobiles/Special/Neira.cs b/Scripts/Mobiles/Special/Neira.cs index 04e9df4a5..065e529d6 100644 --- a/Scripts/Mobiles/Special/Neira.cs +++ b/Scripts/Mobiles/Special/Neira.cs @@ -8,15 +8,15 @@ namespace Server.Mobiles { public class Neira : BaseChampion { - public override ChampionSkullType SkullType{ get{ return ChampionSkullType.Death; } } + public override ChampionSkullType SkullType => ChampionSkullType.Death; - public override Type[] UniqueList{ get{ return new Type[] { typeof( ShroudOfDeciet ) }; } } + public override Type[] UniqueList => new Type[] { typeof( ShroudOfDeciet ) }; public override Type[] SharedList{ get{ return new Type[] { typeof( ANecromancerShroud ), typeof( CaptainJohnsHat ) }; } } - public override Type[] DecorativeList{ get{ return new Type[] { typeof( WallBlood ), typeof( TatteredAncientMummyWrapping ) }; } } + public override Type[] DecorativeList => new Type[] { typeof( WallBlood ), typeof( TatteredAncientMummyWrapping ) }; - public override MonsterStatuetteType[] StatueTypes{ get{ return new MonsterStatuetteType[] { }; } } + public override MonsterStatuetteType[] StatueTypes => new MonsterStatuetteType[] { }; public override string DefaultName => "Neira"; @@ -148,7 +148,7 @@ namespace Server.Mobiles private Mobile m_Rider; private VirtualMount m_Mount; - public Mobile Rider { get { return m_Rider; } } + public Mobile Rider => m_Rider; public VirtualMountItem( Mobile mob ) : base( 0x3EBB ) diff --git a/Scripts/Mobiles/Special/OrderGuard.cs b/Scripts/Mobiles/Special/OrderGuard.cs index 94f028533..67cef3471 100644 --- a/Scripts/Mobiles/Special/OrderGuard.cs +++ b/Scripts/Mobiles/Special/OrderGuard.cs @@ -8,10 +8,10 @@ namespace Server.Mobiles { public class OrderGuard : BaseShieldGuard { - public override int Keyword{ get{ return 0x21; } } // *order shield* - public override BaseShield Shield{ get{ return new OrderShield(); } } - public override int SignupNumber{ get{ return 1007141; } } // Sign up with a guild of order if thou art interested. - public override GuildType Type{ get{ return GuildType.Order; } } + public override int Keyword => 0x21; // *order shield* + public override BaseShield Shield => new OrderShield(); + public override int SignupNumber => 1007141; // Sign up with a guild of order if thou art interested. + public override GuildType Type => GuildType.Order; public override bool BardImmune => true; diff --git a/Scripts/Mobiles/Special/Rikktor.cs b/Scripts/Mobiles/Special/Rikktor.cs index f6b65c35a..e30a7f0a4 100644 --- a/Scripts/Mobiles/Special/Rikktor.cs +++ b/Scripts/Mobiles/Special/Rikktor.cs @@ -9,9 +9,9 @@ namespace Server.Mobiles { public class Rikktor : BaseChampion { - public override ChampionSkullType SkullType{ get{ return ChampionSkullType.Power; } } + public override ChampionSkullType SkullType => ChampionSkullType.Power; - public override Type[] UniqueList{ get{ return new Type[] { typeof( CrownOfTalKeesh ) }; } } + public override Type[] UniqueList => new Type[] { typeof( CrownOfTalKeesh ) }; public override Type[] SharedList{ get{ return new Type[] { typeof( TheMostKnowledgePerson ), typeof( BraveKnightOfTheBritannia ), typeof( LieutenantOfTheBritannianRoyalGuard ) }; } } @@ -64,8 +64,8 @@ namespace Server.Mobiles } public override Poison PoisonImmune => Poison.Lethal; - public override ScaleType ScaleType{ get{ return ScaleType.All; } } - public override int Scales{ get{ return 20; } } + public override ScaleType ScaleType => ScaleType.All; + public override int Scales => 20; public override void OnGaveMeleeAttack( Mobile defender ) { diff --git a/Scripts/Mobiles/Special/Semidar.cs b/Scripts/Mobiles/Special/Semidar.cs index c28d3b54b..4f0458bd3 100644 --- a/Scripts/Mobiles/Special/Semidar.cs +++ b/Scripts/Mobiles/Special/Semidar.cs @@ -7,13 +7,13 @@ namespace Server.Mobiles { public class Semidar : BaseChampion { - public override ChampionSkullType SkullType{ get{ return ChampionSkullType.Pain; } } + public override ChampionSkullType SkullType => ChampionSkullType.Pain; - public override Type[] UniqueList{ get{ return new Type[] { typeof( GladiatorsCollar ) }; } } - public override Type[] SharedList { get { return new Type[] { typeof(RoyalGuardSurvivalKnife), typeof(ANecromancerShroud), typeof(LieutenantOfTheBritannianRoyalGuard) }; } } - public override Type[] DecorativeList{ get{ return new Type[] { typeof( LavaTile ), typeof( DemonSkull ) }; } } + public override Type[] UniqueList => new Type[] { typeof( GladiatorsCollar ) }; + public override Type[] SharedList => new Type[] { typeof(RoyalGuardSurvivalKnife), typeof(ANecromancerShroud), typeof(LieutenantOfTheBritannianRoyalGuard) }; + public override Type[] DecorativeList => new Type[] { typeof( LavaTile ), typeof( DemonSkull ) }; - public override MonsterStatuetteType[] StatueTypes{ get{ return new MonsterStatuetteType[] { }; } } + public override MonsterStatuetteType[] StatueTypes => new MonsterStatuetteType[] { }; public override string DefaultName => "Semidar"; diff --git a/Scripts/Mobiles/Special/Serado.cs b/Scripts/Mobiles/Special/Serado.cs index 897a826b6..0b13a5fe1 100644 --- a/Scripts/Mobiles/Special/Serado.cs +++ b/Scripts/Mobiles/Special/Serado.cs @@ -8,16 +8,16 @@ namespace Server.Mobiles { public class Serado : BaseChampion { - public override ChampionSkullType SkullType{ get{ return ChampionSkullType.Power; } } + public override ChampionSkullType SkullType => ChampionSkullType.Power; - public override Type[] UniqueList{ get{ return new Type[] { typeof( Pacify ) }; } } + public override Type[] UniqueList => new Type[] { typeof( Pacify ) }; public override Type[] SharedList{ get{ return new Type[] { typeof( BraveKnightOfTheBritannia ), typeof( DetectiveBoots ), typeof( EmbroideredOakLeafCloak ), typeof( LieutenantOfTheBritannianRoyalGuard ) }; } } - public override Type[] DecorativeList{ get{ return new Type[] { typeof( Futon ), typeof( SwampTile ) }; } } + public override Type[] DecorativeList => new Type[] { typeof( Futon ), typeof( SwampTile ) }; - public override MonsterStatuetteType[] StatueTypes{ get{ return new MonsterStatuetteType[] { }; } } + public override MonsterStatuetteType[] StatueTypes => new MonsterStatuetteType[] { }; public override WeaponAbility GetWeaponAbility() => WeaponAbility.DoubleStrike; @@ -68,13 +68,13 @@ namespace Server.Mobiles AddLoot( LootPack.Gems, 6 ); } - public override int TreasureMapLevel{ get{ return 5; } } + public override int TreasureMapLevel => 5; public override Poison HitPoison => Poison.Lethal; public override Poison PoisonImmune => Poison.Lethal; public override double HitPoisonChance{ get{ return 0.8; } } - public override int Feathers{ get{ return 30; } } + public override int Feathers => 30; public override bool ShowFameTitle => false; public override bool ClickTitle => false; diff --git a/Scripts/Mobiles/Special/Silvani.cs b/Scripts/Mobiles/Special/Silvani.cs index 8c838969e..61cc2db64 100644 --- a/Scripts/Mobiles/Special/Silvani.cs +++ b/Scripts/Mobiles/Special/Silvani.cs @@ -57,7 +57,7 @@ namespace Server.Mobiles public override bool CanFly => true; public override bool Unprovokable => true; public override Poison PoisonImmune => Poison.Regular; - public override int TreasureMapLevel{ get{ return 5; } } + public override int TreasureMapLevel => 5; public void SpawnPixies( Mobile target ) { diff --git a/Scripts/Mobiles/Townfolk/Banker.cs b/Scripts/Mobiles/Townfolk/Banker.cs index 9aa55c6be..559d51dd4 100644 --- a/Scripts/Mobiles/Townfolk/Banker.cs +++ b/Scripts/Mobiles/Townfolk/Banker.cs @@ -15,7 +15,7 @@ namespace Server.Mobiles private List m_SBInfos = new List(); protected override List SBInfos{ get { return m_SBInfos; } } - public override NpcGuild NpcGuild{ get{ return NpcGuild.MerchantsGuild; } } + public override NpcGuild NpcGuild => NpcGuild.MerchantsGuild; [Constructible] public Banker() : base( "the banker" ) diff --git a/Scripts/Mobiles/Townfolk/BaseEscortable.cs b/Scripts/Mobiles/Townfolk/BaseEscortable.cs index 40dc10dd3..2e104c178 100644 --- a/Scripts/Mobiles/Townfolk/BaseEscortable.cs +++ b/Scripts/Mobiles/Townfolk/BaseEscortable.cs @@ -79,7 +79,7 @@ namespace Server.Mobiles return result; } - public override bool CanShout { get { return ( !Controlled && !IsBeingDeleted ); } } + public override bool CanShout => ( !Controlled && !IsBeingDeleted ); public override void Shout( PlayerMobile pm ) { @@ -105,7 +105,7 @@ namespace Server.Mobiles } public override bool Commandable => false; // Our master cannot boss us around! - public override bool DeleteCorpseOnDeath { get { return m_DeleteCorpse; } } + public override bool DeleteCorpseOnDeath => m_DeleteCorpse; [CommandProperty(AccessLevel.GameMaster)] public string Destination diff --git a/Scripts/Mobiles/Townfolk/Minter.cs b/Scripts/Mobiles/Townfolk/Minter.cs index d89c2ff29..d8a5ab9f0 100644 --- a/Scripts/Mobiles/Townfolk/Minter.cs +++ b/Scripts/Mobiles/Townfolk/Minter.cs @@ -9,7 +9,7 @@ namespace Server.Mobiles { public class Minter : Banker { - public override NpcGuild NpcGuild{ get{ return NpcGuild.MerchantsGuild; } } + public override NpcGuild NpcGuild => NpcGuild.MerchantsGuild; [Constructible] public Minter() @@ -35,4 +35,4 @@ namespace Server.Mobiles int version = reader.ReadInt(); } } -} \ No newline at end of file +} diff --git a/Scripts/Mobiles/Vendors/BaseVendor.cs b/Scripts/Mobiles/Vendors/BaseVendor.cs index 28a46a20b..e74c09bb3 100644 --- a/Scripts/Mobiles/Vendors/BaseVendor.cs +++ b/Scripts/Mobiles/Vendors/BaseVendor.cs @@ -40,11 +40,11 @@ namespace Server.Mobiles public override bool PlayerRangeSensitive => true; - public virtual bool IsActiveVendor { get { return true; } } - public virtual bool IsActiveBuyer { get { return IsActiveVendor; } } // response to vendor SELL - public virtual bool IsActiveSeller { get { return IsActiveVendor; } } // response to vendor BUY + public virtual bool IsActiveVendor => true; + public virtual bool IsActiveBuyer => IsActiveVendor; // response to vendor SELL + public virtual bool IsActiveSeller => IsActiveVendor; // response to vendor BUY - public virtual NpcGuild NpcGuild { get { return NpcGuild.None; } } + public virtual NpcGuild NpcGuild => NpcGuild.None; public override bool IsInvulnerable => true; diff --git a/Scripts/Mobiles/Vendors/GenericBuy.cs b/Scripts/Mobiles/Vendors/GenericBuy.cs index c466304ad..239bd55f1 100644 --- a/Scripts/Mobiles/Vendors/GenericBuy.cs +++ b/Scripts/Mobiles/Vendors/GenericBuy.cs @@ -32,8 +32,7 @@ namespace Server.Mobiles public IEntity Lookup( Type key ) { - IEntity e = null; - m_Table.TryGetValue( key, out e ); + m_Table.TryGetValue( key, out IEntity e ); return e; } @@ -115,7 +114,7 @@ namespace Server.Mobiles public virtual int ControlSlots{ get{ return 0; } } - public virtual bool CanCacheDisplay{ get{ return false; } } //return ( m_Args == null || m_Args.Length == 0 ); } + public virtual bool CanCacheDisplay{ get{ return false; } } //return ( m_Args == null || m_Args.Length == 0 ); } private bool IsDeleted( IEntity obj ) { @@ -342,4 +341,4 @@ namespace Server.Mobiles m_Amount = m_MaxAmount; } } -} \ No newline at end of file +} diff --git a/Scripts/Mobiles/Vendors/GenericSell.cs b/Scripts/Mobiles/Vendors/GenericSell.cs index 6e2de70bb..d2da566a5 100644 --- a/Scripts/Mobiles/Vendors/GenericSell.cs +++ b/Scripts/Mobiles/Vendors/GenericSell.cs @@ -21,8 +21,7 @@ namespace Server.Mobiles public int GetSellPriceFor( Item item ) { - int price = 0; - m_Table.TryGetValue( item.GetType(), out price ); + m_Table.TryGetValue( item.GetType(), out int price ); if ( item is BaseArmor ) { BaseArmor armor = (BaseArmor)item; @@ -112,7 +111,7 @@ namespace Server.Mobiles return IsInList( item.GetType() ); } - + public bool IsResellable( Item item ) { if ( item.Nontransferable ) diff --git a/Scripts/Mobiles/Vendors/NPC/Alchemist.cs b/Scripts/Mobiles/Vendors/NPC/Alchemist.cs index 768bdd2b6..940085ca7 100644 --- a/Scripts/Mobiles/Vendors/NPC/Alchemist.cs +++ b/Scripts/Mobiles/Vendors/NPC/Alchemist.cs @@ -9,7 +9,7 @@ namespace Server.Mobiles private List m_SBInfos = new List(); protected override List SBInfos{ get { return m_SBInfos; } } - public override NpcGuild NpcGuild{ get{ return NpcGuild.MagesGuild; } } + public override NpcGuild NpcGuild => NpcGuild.MagesGuild; [Constructible] public Alchemist() : base( "the alchemist" ) @@ -53,4 +53,4 @@ namespace Server.Mobiles int version = reader.ReadInt(); } } -} \ No newline at end of file +} diff --git a/Scripts/Mobiles/Vendors/NPC/Architect.cs b/Scripts/Mobiles/Vendors/NPC/Architect.cs index 56bf71a6b..ca7e176e2 100644 --- a/Scripts/Mobiles/Vendors/NPC/Architect.cs +++ b/Scripts/Mobiles/Vendors/NPC/Architect.cs @@ -9,7 +9,7 @@ namespace Server.Mobiles private List m_SBInfos = new List(); protected override List SBInfos{ get { return m_SBInfos; } } - public override NpcGuild NpcGuild{ get{ return NpcGuild.TinkersGuild; } } + public override NpcGuild NpcGuild => NpcGuild.TinkersGuild; [Constructible] public Architect() : base( "the architect" ) @@ -42,4 +42,4 @@ namespace Server.Mobiles int version = reader.ReadInt(); } } -} \ No newline at end of file +} diff --git a/Scripts/Mobiles/Vendors/NPC/Bard.cs b/Scripts/Mobiles/Vendors/NPC/Bard.cs index d5da4325d..1d6c9244b 100644 --- a/Scripts/Mobiles/Vendors/NPC/Bard.cs +++ b/Scripts/Mobiles/Vendors/NPC/Bard.cs @@ -9,7 +9,7 @@ namespace Server.Mobiles private List m_SBInfos = new List(); protected override List SBInfos{ get { return m_SBInfos; } } - public override NpcGuild NpcGuild{ get{ return NpcGuild.BardsGuild; } } + public override NpcGuild NpcGuild => NpcGuild.BardsGuild; [Constructible] public Bard() : base( "the bard" ) @@ -45,4 +45,4 @@ namespace Server.Mobiles int version = reader.ReadInt(); } } -} \ No newline at end of file +} diff --git a/Scripts/Mobiles/Vendors/NPC/Barkeeper.cs b/Scripts/Mobiles/Vendors/NPC/Barkeeper.cs index 14e3dad45..4e33be351 100644 --- a/Scripts/Mobiles/Vendors/NPC/Barkeeper.cs +++ b/Scripts/Mobiles/Vendors/NPC/Barkeeper.cs @@ -11,15 +11,15 @@ namespace Server.Mobiles { public class Barkeeper : BaseVendor { - private List m_SBInfos = new List(); - protected override List SBInfos{ get { return m_SBInfos; } } + private List m_SBInfos = new List(); + protected override List SBInfos{ get { return m_SBInfos; } } public override void InitSBInfo() { - m_SBInfos.Add( new SBBarkeeper() ); + m_SBInfos.Add( new SBBarkeeper() ); } - public override VendorShoeType ShoeType{ get{ return Utility.RandomBool() ? VendorShoeType.ThighBoots : VendorShoeType.Boots; } } + public override VendorShoeType ShoeType => Utility.RandomBool() ? VendorShoeType.ThighBoots : VendorShoeType.Boots; public override void InitOutfit() { @@ -51,4 +51,4 @@ namespace Server.Mobiles int version = reader.ReadInt(); } } -} \ No newline at end of file +} diff --git a/Scripts/Mobiles/Vendors/NPC/Beekeeper.cs b/Scripts/Mobiles/Vendors/NPC/Beekeeper.cs index 591ccf05f..72a00bbf3 100644 --- a/Scripts/Mobiles/Vendors/NPC/Beekeeper.cs +++ b/Scripts/Mobiles/Vendors/NPC/Beekeeper.cs @@ -1,42 +1,42 @@ -using System; -using System.Collections.Generic; -using Server; +using System; +using System.Collections.Generic; +using Server; -namespace Server.Mobiles -{ - public class Beekeeper : BaseVendor - { - private List m_SBInfos = new List(); - protected override List SBInfos{ get { return m_SBInfos; } } +namespace Server.Mobiles +{ + public class Beekeeper : BaseVendor + { + private List m_SBInfos = new List(); + protected override List SBInfos{ get { return m_SBInfos; } } [Constructible] - public Beekeeper() : base( "the beekeeper" ) - { - } - - public override void InitSBInfo() - { - m_SBInfos.Add( new SBBeekeeper() ); + public Beekeeper() : base( "the beekeeper" ) + { } - public override VendorShoeType ShoeType{ get{ return VendorShoeType.Boots; } } - - public Beekeeper( Serial serial ) : base( serial ) - { + public override void InitSBInfo() + { + m_SBInfos.Add( new SBBeekeeper() ); } - public override void Serialize( GenericWriter writer ) - { - base.Serialize( writer ); + public override VendorShoeType ShoeType => VendorShoeType.Boots; - writer.Write( (int) 0 ); // version - } + public Beekeeper( Serial serial ) : base( serial ) + { + } - public override void Deserialize( GenericReader reader ) - { - base.Deserialize( reader ); + public override void Serialize( GenericWriter writer ) + { + base.Serialize( writer ); - int version = reader.ReadInt(); - } - } -} \ No newline at end of file + writer.Write( (int) 0 ); // version + } + + public override void Deserialize( GenericReader reader ) + { + base.Deserialize( reader ); + + int version = reader.ReadInt(); + } + } +} diff --git a/Scripts/Mobiles/Vendors/NPC/Blacksmith.cs b/Scripts/Mobiles/Vendors/NPC/Blacksmith.cs index c0a8af05b..e4d38ac80 100644 --- a/Scripts/Mobiles/Vendors/NPC/Blacksmith.cs +++ b/Scripts/Mobiles/Vendors/NPC/Blacksmith.cs @@ -10,7 +10,7 @@ namespace Server.Mobiles private List m_SBInfos = new List(); protected override List SBInfos{ get { return m_SBInfos; } } - public override NpcGuild NpcGuild{ get{ return NpcGuild.BlacksmithsGuild; } } + public override NpcGuild NpcGuild => NpcGuild.BlacksmithsGuild; [Constructible] public Blacksmith() : base( "the blacksmith" ) @@ -44,11 +44,11 @@ namespace Server.Mobiles m_SBInfos.Add( new SBMaceWeapon() ); m_SBInfos.Add( new SBSpearForkWeapon() ); m_SBInfos.Add( new SBSwordWeapon() );*/ - + m_SBInfos.Add( new SBBlacksmith() ); if ( IsTokunoVendor ) { - m_SBInfos.Add( new SBSEArmor() ); + m_SBInfos.Add( new SBSEArmor() ); m_SBInfos.Add( new SBSEWeapons() ); } } @@ -145,4 +145,4 @@ namespace Server.Mobiles int version = reader.ReadInt(); } } -} \ No newline at end of file +} diff --git a/Scripts/Mobiles/Vendors/NPC/Carpenter.cs b/Scripts/Mobiles/Vendors/NPC/Carpenter.cs index 46e6d67ef..64110269e 100644 --- a/Scripts/Mobiles/Vendors/NPC/Carpenter.cs +++ b/Scripts/Mobiles/Vendors/NPC/Carpenter.cs @@ -9,7 +9,7 @@ namespace Server.Mobiles private List m_SBInfos = new List(); protected override List SBInfos{ get { return m_SBInfos; } } - public override NpcGuild NpcGuild{ get{ return NpcGuild.TinkersGuild; } } + public override NpcGuild NpcGuild => NpcGuild.TinkersGuild; [Constructible] public Carpenter() : base( "the carpenter" ) @@ -23,7 +23,7 @@ namespace Server.Mobiles m_SBInfos.Add( new SBStavesWeapon() ); m_SBInfos.Add( new SBCarpenter() ); m_SBInfos.Add( new SBWoodenShields() ); - + if ( IsTokunoVendor ) m_SBInfos.Add( new SBSECarpenter() ); } @@ -53,4 +53,4 @@ namespace Server.Mobiles int version = reader.ReadInt(); } } -} \ No newline at end of file +} diff --git a/Scripts/Mobiles/Vendors/NPC/Fisherman.cs b/Scripts/Mobiles/Vendors/NPC/Fisherman.cs index 116b08067..60ed449fa 100644 --- a/Scripts/Mobiles/Vendors/NPC/Fisherman.cs +++ b/Scripts/Mobiles/Vendors/NPC/Fisherman.cs @@ -9,7 +9,7 @@ namespace Server.Mobiles private List m_SBInfos = new List(); protected override List SBInfos{ get { return m_SBInfos; } } - public override NpcGuild NpcGuild{ get{ return NpcGuild.FishermensGuild; } } + public override NpcGuild NpcGuild => NpcGuild.FishermensGuild; [Constructible] public Fisherman() : base( "the fisher" ) @@ -47,4 +47,4 @@ namespace Server.Mobiles int version = reader.ReadInt(); } } -} \ No newline at end of file +} diff --git a/Scripts/Mobiles/Vendors/NPC/Glassblower.cs b/Scripts/Mobiles/Vendors/NPC/Glassblower.cs index e975aadfb..b5586f9b7 100644 --- a/Scripts/Mobiles/Vendors/NPC/Glassblower.cs +++ b/Scripts/Mobiles/Vendors/NPC/Glassblower.cs @@ -10,7 +10,7 @@ namespace Server.Mobiles private List m_SBInfos = new List(); protected override List SBInfos{ get { return m_SBInfos; } } - public override NpcGuild NpcGuild{ get{ return NpcGuild.MagesGuild; } } + public override NpcGuild NpcGuild => NpcGuild.MagesGuild; [Constructible] public Glassblower() : base( "the alchemist" ) @@ -46,4 +46,4 @@ namespace Server.Mobiles Body = 0x2F6; } } -} \ No newline at end of file +} diff --git a/Scripts/Mobiles/Vendors/NPC/Guildmasters/BardGuildmaster.cs b/Scripts/Mobiles/Vendors/NPC/Guildmasters/BardGuildmaster.cs index fec571e14..bf0eea2d9 100644 --- a/Scripts/Mobiles/Vendors/NPC/Guildmasters/BardGuildmaster.cs +++ b/Scripts/Mobiles/Vendors/NPC/Guildmasters/BardGuildmaster.cs @@ -6,7 +6,7 @@ namespace Server.Mobiles { public class BardGuildmaster : BaseGuildmaster { - public override NpcGuild NpcGuild{ get{ return NpcGuild.BardsGuild; } } + public override NpcGuild NpcGuild => NpcGuild.BardsGuild; [Constructible] public BardGuildmaster() : base( "bard" ) @@ -37,4 +37,4 @@ namespace Server.Mobiles int version = reader.ReadInt(); } } -} \ No newline at end of file +} diff --git a/Scripts/Mobiles/Vendors/NPC/Guildmasters/BlacksmithGuildmaster.cs b/Scripts/Mobiles/Vendors/NPC/Guildmasters/BlacksmithGuildmaster.cs index 18d7ea24a..05122ba98 100644 --- a/Scripts/Mobiles/Vendors/NPC/Guildmasters/BlacksmithGuildmaster.cs +++ b/Scripts/Mobiles/Vendors/NPC/Guildmasters/BlacksmithGuildmaster.cs @@ -6,7 +6,7 @@ namespace Server.Mobiles { public class BlacksmithGuildmaster : BaseGuildmaster { - public override NpcGuild NpcGuild{ get{ return NpcGuild.BlacksmithsGuild; } } + public override NpcGuild NpcGuild => NpcGuild.BlacksmithsGuild; public override bool IsActiveVendor => true; diff --git a/Scripts/Mobiles/Vendors/NPC/Guildmasters/FisherGuildmaster.cs b/Scripts/Mobiles/Vendors/NPC/Guildmasters/FisherGuildmaster.cs index 9e0ac9b28..c18f152fa 100644 --- a/Scripts/Mobiles/Vendors/NPC/Guildmasters/FisherGuildmaster.cs +++ b/Scripts/Mobiles/Vendors/NPC/Guildmasters/FisherGuildmaster.cs @@ -6,7 +6,7 @@ namespace Server.Mobiles { public class FisherGuildmaster : BaseGuildmaster { - public override NpcGuild NpcGuild{ get{ return NpcGuild.FishermensGuild; } } + public override NpcGuild NpcGuild => NpcGuild.FishermensGuild; [Constructible] public FisherGuildmaster() : base( "fisher" ) @@ -32,4 +32,4 @@ namespace Server.Mobiles int version = reader.ReadInt(); } } -} \ No newline at end of file +} diff --git a/Scripts/Mobiles/Vendors/NPC/Guildmasters/HealerGuildmaster.cs b/Scripts/Mobiles/Vendors/NPC/Guildmasters/HealerGuildmaster.cs index a7b07aeb5..3d60937e8 100644 --- a/Scripts/Mobiles/Vendors/NPC/Guildmasters/HealerGuildmaster.cs +++ b/Scripts/Mobiles/Vendors/NPC/Guildmasters/HealerGuildmaster.cs @@ -6,7 +6,7 @@ namespace Server.Mobiles { public class HealerGuildmaster : BaseGuildmaster { - public override NpcGuild NpcGuild{ get{ return NpcGuild.HealersGuild; } } + public override NpcGuild NpcGuild => NpcGuild.HealersGuild; [Constructible] public HealerGuildmaster() : base( "healer" ) @@ -48,4 +48,4 @@ namespace Server.Mobiles int version = reader.ReadInt(); } } -} \ No newline at end of file +} diff --git a/Scripts/Mobiles/Vendors/NPC/Guildmasters/MageGuildmaster.cs b/Scripts/Mobiles/Vendors/NPC/Guildmasters/MageGuildmaster.cs index 0d14e9012..52391cc1f 100644 --- a/Scripts/Mobiles/Vendors/NPC/Guildmasters/MageGuildmaster.cs +++ b/Scripts/Mobiles/Vendors/NPC/Guildmasters/MageGuildmaster.cs @@ -6,7 +6,7 @@ namespace Server.Mobiles { public class MageGuildmaster : BaseGuildmaster { - public override NpcGuild NpcGuild{ get{ return NpcGuild.MagesGuild; } } + public override NpcGuild NpcGuild => NpcGuild.MagesGuild; [Constructible] public MageGuildmaster() : base( "mage" ) @@ -51,4 +51,4 @@ namespace Server.Mobiles int version = reader.ReadInt(); } } -} \ No newline at end of file +} diff --git a/Scripts/Mobiles/Vendors/NPC/Guildmasters/MerchantGuildmaster.cs b/Scripts/Mobiles/Vendors/NPC/Guildmasters/MerchantGuildmaster.cs index e253d19ab..b9d3b5cab 100644 --- a/Scripts/Mobiles/Vendors/NPC/Guildmasters/MerchantGuildmaster.cs +++ b/Scripts/Mobiles/Vendors/NPC/Guildmasters/MerchantGuildmaster.cs @@ -6,7 +6,7 @@ namespace Server.Mobiles { public class MerchantGuildmaster : BaseGuildmaster { - public override NpcGuild NpcGuild{ get{ return NpcGuild.MerchantsGuild; } } + public override NpcGuild NpcGuild => NpcGuild.MerchantsGuild; [Constructible] public MerchantGuildmaster() : base( "merchant" ) @@ -33,4 +33,4 @@ namespace Server.Mobiles int version = reader.ReadInt(); } } -} \ No newline at end of file +} diff --git a/Scripts/Mobiles/Vendors/NPC/Guildmasters/MinerGuildmaster.cs b/Scripts/Mobiles/Vendors/NPC/Guildmasters/MinerGuildmaster.cs index 8efd4dc42..7c250c788 100644 --- a/Scripts/Mobiles/Vendors/NPC/Guildmasters/MinerGuildmaster.cs +++ b/Scripts/Mobiles/Vendors/NPC/Guildmasters/MinerGuildmaster.cs @@ -6,7 +6,7 @@ namespace Server.Mobiles { public class MinerGuildmaster : BaseGuildmaster { - public override NpcGuild NpcGuild{ get{ return NpcGuild.MinersGuild; } } + public override NpcGuild NpcGuild => NpcGuild.MinersGuild; [Constructible] public MinerGuildmaster() : base( "miner" ) @@ -33,4 +33,4 @@ namespace Server.Mobiles int version = reader.ReadInt(); } } -} \ No newline at end of file +} diff --git a/Scripts/Mobiles/Vendors/NPC/Guildmasters/RangerGuildmaster.cs b/Scripts/Mobiles/Vendors/NPC/Guildmasters/RangerGuildmaster.cs index 527545135..20b854cd1 100644 --- a/Scripts/Mobiles/Vendors/NPC/Guildmasters/RangerGuildmaster.cs +++ b/Scripts/Mobiles/Vendors/NPC/Guildmasters/RangerGuildmaster.cs @@ -6,7 +6,7 @@ namespace Server.Mobiles { public class RangerGuildmaster : BaseGuildmaster { - public override NpcGuild NpcGuild{ get{ return NpcGuild.RangersGuild; } } + public override NpcGuild NpcGuild => NpcGuild.RangersGuild; [Constructible] public RangerGuildmaster() : base( "ranger" ) @@ -42,4 +42,4 @@ namespace Server.Mobiles int version = reader.ReadInt(); } } -} \ No newline at end of file +} diff --git a/Scripts/Mobiles/Vendors/NPC/Guildmasters/TailorGuildmaster.cs b/Scripts/Mobiles/Vendors/NPC/Guildmasters/TailorGuildmaster.cs index 7a878138e..b4bc43c42 100644 --- a/Scripts/Mobiles/Vendors/NPC/Guildmasters/TailorGuildmaster.cs +++ b/Scripts/Mobiles/Vendors/NPC/Guildmasters/TailorGuildmaster.cs @@ -6,7 +6,7 @@ namespace Server.Mobiles { public class TailorGuildmaster : BaseGuildmaster { - public override NpcGuild NpcGuild{ get{ return NpcGuild.TailorsGuild; } } + public override NpcGuild NpcGuild => NpcGuild.TailorsGuild; [Constructible] public TailorGuildmaster() : base( "tailor" ) @@ -32,4 +32,4 @@ namespace Server.Mobiles int version = reader.ReadInt(); } } -} \ No newline at end of file +} diff --git a/Scripts/Mobiles/Vendors/NPC/Guildmasters/ThiefGuildmaster.cs b/Scripts/Mobiles/Vendors/NPC/Guildmasters/ThiefGuildmaster.cs index c38f43849..4182a3fe8 100644 --- a/Scripts/Mobiles/Vendors/NPC/Guildmasters/ThiefGuildmaster.cs +++ b/Scripts/Mobiles/Vendors/NPC/Guildmasters/ThiefGuildmaster.cs @@ -7,9 +7,9 @@ namespace Server.Mobiles { public class ThiefGuildmaster : BaseGuildmaster { - public override NpcGuild NpcGuild{ get{ return NpcGuild.ThievesGuild; } } + public override NpcGuild NpcGuild => NpcGuild.ThievesGuild; - public override TimeSpan JoinAge{ get{ return TimeSpan.FromDays( 7.0 ); } } + public override TimeSpan JoinAge => TimeSpan.FromDays( 7.0 ); [Constructible] public ThiefGuildmaster() : base( "thief" ) @@ -124,4 +124,4 @@ namespace Server.Mobiles int version = reader.ReadInt(); } } -} \ No newline at end of file +} diff --git a/Scripts/Mobiles/Vendors/NPC/Guildmasters/TinkerGuildmaster.cs b/Scripts/Mobiles/Vendors/NPC/Guildmasters/TinkerGuildmaster.cs index e798f1f1c..642f7dc51 100644 --- a/Scripts/Mobiles/Vendors/NPC/Guildmasters/TinkerGuildmaster.cs +++ b/Scripts/Mobiles/Vendors/NPC/Guildmasters/TinkerGuildmaster.cs @@ -9,7 +9,7 @@ namespace Server.Mobiles { public class TinkerGuildmaster : BaseGuildmaster { - public override NpcGuild NpcGuild{ get{ return NpcGuild.TinkersGuild; } } + public override NpcGuild NpcGuild => NpcGuild.TinkersGuild; [Constructible] public TinkerGuildmaster() : base( "tinker" ) @@ -38,20 +38,20 @@ namespace Server.Mobiles } public override void AddCustomContextEntries( Mobile from, List list ) - { + { if ( Core.ML && from.Alive ) { RechargeEntry entry = new RechargeEntry( from, this ); - + if ( WeaponEngravingTool.Find( from ) == null ) entry.Enabled = false; - + list.Add( entry ); } - + base.AddCustomContextEntries( from, list ); } - + private class RechargeEntry : ContextMenuEntry { private Mobile m_From; @@ -67,9 +67,9 @@ namespace Server.Mobiles { if ( !Core.ML || m_Vendor == null || m_Vendor.Deleted ) return; - + WeaponEngravingTool tool = WeaponEngravingTool.Find( m_From ); - + if ( tool != null && tool.UsesRemaining <= 0 ) { if ( Banker.GetBalance( m_From ) >= 100000 ) @@ -82,4 +82,4 @@ namespace Server.Mobiles } } } -} \ No newline at end of file +} diff --git a/Scripts/Mobiles/Vendors/NPC/Guildmasters/WarriorGuildmaster.cs b/Scripts/Mobiles/Vendors/NPC/Guildmasters/WarriorGuildmaster.cs index 6888976ae..2caaba989 100644 --- a/Scripts/Mobiles/Vendors/NPC/Guildmasters/WarriorGuildmaster.cs +++ b/Scripts/Mobiles/Vendors/NPC/Guildmasters/WarriorGuildmaster.cs @@ -6,7 +6,7 @@ namespace Server.Mobiles { public class WarriorGuildmaster : BaseGuildmaster { - public override NpcGuild NpcGuild{ get{ return NpcGuild.WarriorsGuild; } } + public override NpcGuild NpcGuild => NpcGuild.WarriorsGuild; [Constructible] public WarriorGuildmaster() : base( "warrior" ) @@ -38,4 +38,4 @@ namespace Server.Mobiles int version = reader.ReadInt(); } } -} \ No newline at end of file +} diff --git a/Scripts/Mobiles/Vendors/NPC/GypsyBanker.cs b/Scripts/Mobiles/Vendors/NPC/GypsyBanker.cs index 4f527e7c2..f22c90390 100644 --- a/Scripts/Mobiles/Vendors/NPC/GypsyBanker.cs +++ b/Scripts/Mobiles/Vendors/NPC/GypsyBanker.cs @@ -12,7 +12,7 @@ namespace Server.Mobiles public class GypsyBanker : Banker { public override bool IsActiveVendor => false; - public override NpcGuild NpcGuild{ get{ return NpcGuild.None; } } + public override NpcGuild NpcGuild => NpcGuild.None; public override bool ClickTitle => false; [Constructible] diff --git a/Scripts/Mobiles/Vendors/NPC/Herbalist.cs b/Scripts/Mobiles/Vendors/NPC/Herbalist.cs index a4466df2c..1f5fa897e 100644 --- a/Scripts/Mobiles/Vendors/NPC/Herbalist.cs +++ b/Scripts/Mobiles/Vendors/NPC/Herbalist.cs @@ -1,50 +1,50 @@ -using System; -using System.Collections.Generic; -using Server; +using System; +using System.Collections.Generic; +using Server; -namespace Server.Mobiles -{ - public class Herbalist : BaseVendor - { - private List m_SBInfos = new List(); +namespace Server.Mobiles +{ + public class Herbalist : BaseVendor + { + private List m_SBInfos = new List(); protected override List SBInfos{ get { return m_SBInfos; } } - public override NpcGuild NpcGuild{ get{ return NpcGuild.MagesGuild; } } + public override NpcGuild NpcGuild => NpcGuild.MagesGuild; [Constructible] - public Herbalist() : base( "the herbalist" ) - { + public Herbalist() : base( "the herbalist" ) + { SetSkill( SkillName.Alchemy, 80.0, 100.0 ); SetSkill( SkillName.Cooking, 80.0, 100.0 ); SetSkill( SkillName.TasteID, 80.0, 100.0 ); - } + } - public override void InitSBInfo() - { - m_SBInfos.Add( new SBHerbalist() ); - } + public override void InitSBInfo() + { + m_SBInfos.Add( new SBHerbalist() ); + } public override VendorShoeType ShoeType { - get{ return Utility.RandomBool() ? VendorShoeType.Shoes : VendorShoeType.Sandals; } + get{ return Utility.RandomBool() ? VendorShoeType.Shoes : VendorShoeType.Sandals; } } - public Herbalist( Serial serial ) : base( serial ) - { - } + public Herbalist( Serial serial ) : base( serial ) + { + } - public override void Serialize( GenericWriter writer ) - { - base.Serialize( writer ); + public override void Serialize( GenericWriter writer ) + { + base.Serialize( writer ); - writer.Write( (int) 0 ); // version - } + writer.Write( (int) 0 ); // version + } - public override void Deserialize( GenericReader reader ) - { - base.Deserialize( reader ); + public override void Deserialize( GenericReader reader ) + { + base.Deserialize( reader ); - int version = reader.ReadInt(); - } - } -} \ No newline at end of file + int version = reader.ReadInt(); + } + } +} diff --git a/Scripts/Mobiles/Vendors/NPC/Mage.cs b/Scripts/Mobiles/Vendors/NPC/Mage.cs index 83c5c5eb2..372fff3b8 100644 --- a/Scripts/Mobiles/Vendors/NPC/Mage.cs +++ b/Scripts/Mobiles/Vendors/NPC/Mage.cs @@ -9,7 +9,7 @@ namespace Server.Mobiles private List m_SBInfos = new List(); protected override List SBInfos{ get { return m_SBInfos; } } - public override NpcGuild NpcGuild{ get{ return NpcGuild.MagesGuild; } } + public override NpcGuild NpcGuild => NpcGuild.MagesGuild; [Constructible] public Mage() : base( "the mage" ) @@ -57,4 +57,4 @@ namespace Server.Mobiles int version = reader.ReadInt(); } } -} \ No newline at end of file +} diff --git a/Scripts/Mobiles/Vendors/NPC/Scribe.cs b/Scripts/Mobiles/Vendors/NPC/Scribe.cs index ef46b7795..7ce254cc1 100644 --- a/Scripts/Mobiles/Vendors/NPC/Scribe.cs +++ b/Scripts/Mobiles/Vendors/NPC/Scribe.cs @@ -9,7 +9,7 @@ namespace Server.Mobiles private List m_SBInfos = new List(); protected override List SBInfos{ get { return m_SBInfos; } } - public override NpcGuild NpcGuild{ get{ return NpcGuild.MagesGuild; } } + public override NpcGuild NpcGuild => NpcGuild.MagesGuild; private DateTime m_NextShush; public static readonly TimeSpan ShushDelay = TimeSpan.FromMinutes( 1 ); @@ -77,4 +77,4 @@ namespace Server.Mobiles int version = reader.ReadInt(); } } -} \ No newline at end of file +} diff --git a/Scripts/Mobiles/Vendors/NPC/StoneCrafter.cs b/Scripts/Mobiles/Vendors/NPC/StoneCrafter.cs index 33a674921..ab0f815d9 100644 --- a/Scripts/Mobiles/Vendors/NPC/StoneCrafter.cs +++ b/Scripts/Mobiles/Vendors/NPC/StoneCrafter.cs @@ -10,7 +10,7 @@ namespace Server.Mobiles private List m_SBInfos = new List(); protected override List SBInfos{ get { return m_SBInfos; } } - public override NpcGuild NpcGuild{ get{ return NpcGuild.TinkersGuild; } } + public override NpcGuild NpcGuild => NpcGuild.TinkersGuild; [Constructible] public StoneCrafter() : base( "the stone crafter" ) @@ -47,4 +47,4 @@ namespace Server.Mobiles Title = "the stone crafter"; } } -} \ No newline at end of file +} diff --git a/Scripts/Mobiles/Vendors/NPC/Tailor.cs b/Scripts/Mobiles/Vendors/NPC/Tailor.cs index 7ce11935d..19a910948 100644 --- a/Scripts/Mobiles/Vendors/NPC/Tailor.cs +++ b/Scripts/Mobiles/Vendors/NPC/Tailor.cs @@ -10,7 +10,7 @@ namespace Server.Mobiles private List m_SBInfos = new List(); protected override List SBInfos{ get { return m_SBInfos; } } - public override NpcGuild NpcGuild{ get{ return NpcGuild.TailorsGuild; } } + public override NpcGuild NpcGuild => NpcGuild.TailorsGuild; [Constructible] public Tailor() : base( "the tailor" ) diff --git a/Scripts/Mobiles/Vendors/NPC/Tinker.cs b/Scripts/Mobiles/Vendors/NPC/Tinker.cs index f7211ed12..977b2b6ab 100644 --- a/Scripts/Mobiles/Vendors/NPC/Tinker.cs +++ b/Scripts/Mobiles/Vendors/NPC/Tinker.cs @@ -9,7 +9,7 @@ namespace Server.Mobiles private List m_SBInfos = new List(); protected override List SBInfos{ get { return m_SBInfos; } } - public override NpcGuild NpcGuild{ get{ return NpcGuild.TinkersGuild; } } + public override NpcGuild NpcGuild => NpcGuild.TinkersGuild; [Constructible] public Tinker() : base( "the tinker" ) @@ -42,4 +42,4 @@ namespace Server.Mobiles int version = reader.ReadInt(); } } -} \ No newline at end of file +} diff --git a/Scripts/Mobiles/Vendors/NPC/Weaver.cs b/Scripts/Mobiles/Vendors/NPC/Weaver.cs index 4dfe0536f..fb3905e07 100644 --- a/Scripts/Mobiles/Vendors/NPC/Weaver.cs +++ b/Scripts/Mobiles/Vendors/NPC/Weaver.cs @@ -10,7 +10,7 @@ namespace Server.Mobiles private List m_SBInfos = new List(); protected override List SBInfos{ get { return m_SBInfos; } } - public override NpcGuild NpcGuild{ get{ return NpcGuild.TailorsGuild; } } + public override NpcGuild NpcGuild => NpcGuild.TailorsGuild; [Constructible] public Weaver() : base( "the weaver" ) @@ -96,4 +96,4 @@ namespace Server.Mobiles int version = reader.ReadInt(); } } -} \ No newline at end of file +} diff --git a/Scripts/Mobiles/Vendors/PlayerBarkeeper.cs b/Scripts/Mobiles/Vendors/PlayerBarkeeper.cs index 546ed8eba..bccbb0458 100644 --- a/Scripts/Mobiles/Vendors/PlayerBarkeeper.cs +++ b/Scripts/Mobiles/Vendors/PlayerBarkeeper.cs @@ -182,7 +182,7 @@ namespace Server.Mobiles public BarkeeperRumor[] Rumors{ get{ return m_Rumors; } } - public override VendorShoeType ShoeType{ get{ return Utility.RandomBool() ? VendorShoeType.ThighBoots : VendorShoeType.Boots; } } + public override VendorShoeType ShoeType => Utility.RandomBool() ? VendorShoeType.ThighBoots : VendorShoeType.Boots; public override bool GetGender() { diff --git a/Scripts/Mobiles/Vendors/PlayerVendor.cs b/Scripts/Mobiles/Vendors/PlayerVendor.cs index cd3aeffb3..15bd0119d 100644 --- a/Scripts/Mobiles/Vendors/PlayerVendor.cs +++ b/Scripts/Mobiles/Vendors/PlayerVendor.cs @@ -95,7 +95,7 @@ namespace Server.Mobiles Weight = 1.0; } - public override int DefaultMaxWeight{ get{ return 0; } } + public override int DefaultMaxWeight => 0; public override bool CheckHold( Mobile m, Item item, bool message, bool checkItems, int plusItems, int plusWeight ) { @@ -779,8 +779,7 @@ namespace Server.Mobiles public VendorItem GetVendorItem( Item item ) { - VendorItem v = null; - m_SellItems.TryGetValue(item, out v); + m_SellItems.TryGetValue( item, out VendorItem v ); return v; } diff --git a/Scripts/Mobiles/Vendors/SBInfo/Armors/SBChainmailArmor.cs b/Scripts/Mobiles/Vendors/SBInfo/Armors/SBChainmailArmor.cs index dc84a65f4..57ffe7b32 100644 --- a/Scripts/Mobiles/Vendors/SBInfo/Armors/SBChainmailArmor.cs +++ b/Scripts/Mobiles/Vendors/SBInfo/Armors/SBChainmailArmor.cs @@ -13,8 +13,8 @@ namespace Server.Mobiles { } - public override IShopSellInfo SellInfo { get { return m_SellInfo; } } - public override List BuyInfo { get { return m_BuyInfo; } } + public override IShopSellInfo SellInfo => m_SellInfo; + public override List BuyInfo => m_BuyInfo; public class InternalBuyInfo : List { diff --git a/Scripts/Mobiles/Vendors/SBInfo/Armors/SBHelmetArmor.cs b/Scripts/Mobiles/Vendors/SBInfo/Armors/SBHelmetArmor.cs index 3eb601e93..00dce7b95 100644 --- a/Scripts/Mobiles/Vendors/SBInfo/Armors/SBHelmetArmor.cs +++ b/Scripts/Mobiles/Vendors/SBInfo/Armors/SBHelmetArmor.cs @@ -13,8 +13,8 @@ namespace Server.Mobiles { } - public override IShopSellInfo SellInfo { get { return m_SellInfo; } } - public override List BuyInfo { get { return m_BuyInfo; } } + public override IShopSellInfo SellInfo => m_SellInfo; + public override List BuyInfo => m_BuyInfo; public class InternalBuyInfo : List { diff --git a/Scripts/Mobiles/Vendors/SBInfo/Armors/SBLeatherArmor.cs b/Scripts/Mobiles/Vendors/SBInfo/Armors/SBLeatherArmor.cs index 2b26db1a8..dff14ac53 100644 --- a/Scripts/Mobiles/Vendors/SBInfo/Armors/SBLeatherArmor.cs +++ b/Scripts/Mobiles/Vendors/SBInfo/Armors/SBLeatherArmor.cs @@ -13,8 +13,8 @@ namespace Server.Mobiles { } - public override IShopSellInfo SellInfo { get { return m_SellInfo; } } - public override List BuyInfo { get { return m_BuyInfo; } } + public override IShopSellInfo SellInfo => m_SellInfo; + public override List BuyInfo => m_BuyInfo; public class InternalBuyInfo : List { diff --git a/Scripts/Mobiles/Vendors/SBInfo/Armors/SBMetalShields.cs b/Scripts/Mobiles/Vendors/SBInfo/Armors/SBMetalShields.cs index 5f279bc2a..9559c7804 100644 --- a/Scripts/Mobiles/Vendors/SBInfo/Armors/SBMetalShields.cs +++ b/Scripts/Mobiles/Vendors/SBInfo/Armors/SBMetalShields.cs @@ -13,8 +13,8 @@ namespace Server.Mobiles { } - public override IShopSellInfo SellInfo { get { return m_SellInfo; } } - public override List BuyInfo { get { return m_BuyInfo; } } + public override IShopSellInfo SellInfo => m_SellInfo; + public override List BuyInfo => m_BuyInfo; public class InternalBuyInfo : List { @@ -42,4 +42,4 @@ namespace Server.Mobiles } } } -} \ No newline at end of file +} diff --git a/Scripts/Mobiles/Vendors/SBInfo/Armors/SBPlateArmor.cs b/Scripts/Mobiles/Vendors/SBInfo/Armors/SBPlateArmor.cs index 5c326d1bb..29d0b230d 100644 --- a/Scripts/Mobiles/Vendors/SBInfo/Armors/SBPlateArmor.cs +++ b/Scripts/Mobiles/Vendors/SBInfo/Armors/SBPlateArmor.cs @@ -13,8 +13,8 @@ namespace Server.Mobiles { } - public override IShopSellInfo SellInfo { get { return m_SellInfo; } } - public override List BuyInfo { get { return m_BuyInfo; } } + public override IShopSellInfo SellInfo => m_SellInfo; + public override List BuyInfo => m_BuyInfo; public class InternalBuyInfo : List { diff --git a/Scripts/Mobiles/Vendors/SBInfo/Armors/SBRingmailArmor.cs b/Scripts/Mobiles/Vendors/SBInfo/Armors/SBRingmailArmor.cs index 11a780eea..a89a92eeb 100644 --- a/Scripts/Mobiles/Vendors/SBInfo/Armors/SBRingmailArmor.cs +++ b/Scripts/Mobiles/Vendors/SBInfo/Armors/SBRingmailArmor.cs @@ -13,8 +13,8 @@ namespace Server.Mobiles { } - public override IShopSellInfo SellInfo { get { return m_SellInfo; } } - public override List BuyInfo { get { return m_BuyInfo; } } + public override IShopSellInfo SellInfo => m_SellInfo; + public override List BuyInfo => m_BuyInfo; public class InternalBuyInfo : List { diff --git a/Scripts/Mobiles/Vendors/SBInfo/Armors/SBStuddedArmor.cs b/Scripts/Mobiles/Vendors/SBInfo/Armors/SBStuddedArmor.cs index 2984cee67..bdc9823f8 100644 --- a/Scripts/Mobiles/Vendors/SBInfo/Armors/SBStuddedArmor.cs +++ b/Scripts/Mobiles/Vendors/SBInfo/Armors/SBStuddedArmor.cs @@ -13,8 +13,8 @@ namespace Server.Mobiles { } - public override IShopSellInfo SellInfo { get { return m_SellInfo; } } - public override List BuyInfo { get { return m_BuyInfo; } } + public override IShopSellInfo SellInfo => m_SellInfo; + public override List BuyInfo => m_BuyInfo; public class InternalBuyInfo : List { diff --git a/Scripts/Mobiles/Vendors/SBInfo/Armors/SBWoodenShields.cs b/Scripts/Mobiles/Vendors/SBInfo/Armors/SBWoodenShields.cs index 2203753fc..cbdc47359 100644 --- a/Scripts/Mobiles/Vendors/SBInfo/Armors/SBWoodenShields.cs +++ b/Scripts/Mobiles/Vendors/SBInfo/Armors/SBWoodenShields.cs @@ -13,8 +13,8 @@ namespace Server.Mobiles { } - public override IShopSellInfo SellInfo { get { return m_SellInfo; } } - public override List BuyInfo { get { return m_BuyInfo; } } + public override IShopSellInfo SellInfo => m_SellInfo; + public override List BuyInfo => m_BuyInfo; public class InternalBuyInfo : List { @@ -32,4 +32,4 @@ namespace Server.Mobiles } } } -} \ No newline at end of file +} diff --git a/Scripts/Mobiles/Vendors/SBInfo/SBAlchemist.cs b/Scripts/Mobiles/Vendors/SBInfo/SBAlchemist.cs index 5a95643d8..314318e41 100644 --- a/Scripts/Mobiles/Vendors/SBInfo/SBAlchemist.cs +++ b/Scripts/Mobiles/Vendors/SBInfo/SBAlchemist.cs @@ -13,8 +13,8 @@ namespace Server.Mobiles { } - public override IShopSellInfo SellInfo { get { return m_SellInfo; } } - public override List BuyInfo { get { return m_BuyInfo; } } + public override IShopSellInfo SellInfo => m_SellInfo; + public override List BuyInfo => m_BuyInfo; public class InternalBuyInfo : List { @@ -39,8 +39,8 @@ namespace Server.Mobiles Add( new GenericBuyInfo( typeof( SpidersSilk ), 3, 20, 0xF8D, 0 ) ); Add( new GenericBuyInfo( typeof( SulfurousAsh ), 3, 20, 0xF8C, 0 ) ); - Add( new GenericBuyInfo( typeof( Bottle ), 5, 100, 0xF0E, 0 ) ); - Add( new GenericBuyInfo( typeof( HeatingStand ), 2, 100, 0x1849, 0 ) ); + Add( new GenericBuyInfo( typeof( Bottle ), 5, 100, 0xF0E, 0 ) ); + Add( new GenericBuyInfo( typeof( HeatingStand ), 2, 100, 0x1849, 0 ) ); Add( new GenericBuyInfo( "1041060", typeof( HairDye ), 37, 10, 0xEFF, 0 ) ); } @@ -50,14 +50,14 @@ namespace Server.Mobiles { public InternalSellInfo() { - Add( typeof( BlackPearl ), 3 ); - Add( typeof( Bloodmoss ), 3 ); - Add( typeof( MandrakeRoot ), 2 ); - Add( typeof( Garlic ), 2 ); - Add( typeof( Ginseng ), 2 ); - Add( typeof( Nightshade ), 2 ); - Add( typeof( SpidersSilk ), 2 ); - Add( typeof( SulfurousAsh ), 2 ); + Add( typeof( BlackPearl ), 3 ); + Add( typeof( Bloodmoss ), 3 ); + Add( typeof( MandrakeRoot ), 2 ); + Add( typeof( Garlic ), 2 ); + Add( typeof( Ginseng ), 2 ); + Add( typeof( Nightshade ), 2 ); + Add( typeof( SpidersSilk ), 2 ); + Add( typeof( SulfurousAsh ), 2 ); Add( typeof( Bottle ), 3 ); Add( typeof( MortarPestle ), 4 ); Add( typeof( HairDye ), 19 ); diff --git a/Scripts/Mobiles/Vendors/SBInfo/SBAnimalTrainer.cs b/Scripts/Mobiles/Vendors/SBInfo/SBAnimalTrainer.cs index cd5962f09..c74895e95 100644 --- a/Scripts/Mobiles/Vendors/SBInfo/SBAnimalTrainer.cs +++ b/Scripts/Mobiles/Vendors/SBInfo/SBAnimalTrainer.cs @@ -13,8 +13,8 @@ namespace Server.Mobiles { } - public override IShopSellInfo SellInfo { get { return m_SellInfo; } } - public override List BuyInfo { get { return m_BuyInfo; } } + public override IShopSellInfo SellInfo => m_SellInfo; + public override List BuyInfo => m_BuyInfo; public class InternalBuyInfo : List { diff --git a/Scripts/Mobiles/Vendors/SBInfo/SBArchitect.cs b/Scripts/Mobiles/Vendors/SBInfo/SBArchitect.cs index 40f6eb15b..69e824283 100644 --- a/Scripts/Mobiles/Vendors/SBInfo/SBArchitect.cs +++ b/Scripts/Mobiles/Vendors/SBInfo/SBArchitect.cs @@ -13,8 +13,8 @@ namespace Server.Mobiles { } - public override IShopSellInfo SellInfo { get { return m_SellInfo; } } - public override List BuyInfo { get { return m_BuyInfo; } } + public override IShopSellInfo SellInfo => m_SellInfo; + public override List BuyInfo => m_BuyInfo; public class InternalBuyInfo : List { @@ -37,4 +37,4 @@ namespace Server.Mobiles } } } -} \ No newline at end of file +} diff --git a/Scripts/Mobiles/Vendors/SBInfo/SBBaker.cs b/Scripts/Mobiles/Vendors/SBInfo/SBBaker.cs index b716bb3d2..ea2380d85 100644 --- a/Scripts/Mobiles/Vendors/SBInfo/SBBaker.cs +++ b/Scripts/Mobiles/Vendors/SBInfo/SBBaker.cs @@ -1,25 +1,25 @@ -using System; -using System.Collections.Generic; -using Server.Items; +using System; +using System.Collections.Generic; +using Server.Items; -namespace Server.Mobiles -{ - public class SBBaker : SBInfo - { - private List m_BuyInfo = new InternalBuyInfo(); - private IShopSellInfo m_SellInfo = new InternalSellInfo(); +namespace Server.Mobiles +{ + public class SBBaker : SBInfo + { + private List m_BuyInfo = new InternalBuyInfo(); + private IShopSellInfo m_SellInfo = new InternalSellInfo(); - public SBBaker() - { - } + public SBBaker() + { + } - public override IShopSellInfo SellInfo { get { return m_SellInfo; } } - public override List BuyInfo { get { return m_BuyInfo; } } + public override IShopSellInfo SellInfo => m_SellInfo; + public override List BuyInfo => m_BuyInfo; - public class InternalBuyInfo : List - { - public InternalBuyInfo() - { + public class InternalBuyInfo : List + { + public InternalBuyInfo() + { Add( new GenericBuyInfo( typeof( BreadLoaf ), 6, 20, 0x103B, 0 ) ); Add( new GenericBuyInfo( typeof( BreadLoaf ), 5, 20, 0x103C, 0 ) ); Add( new GenericBuyInfo( typeof( ApplePie ), 7, 20, 0x1041, 0 ) ); //OSI just has Pie, not Apple/Fruit/Meat @@ -27,32 +27,32 @@ namespace Server.Mobiles Add( new GenericBuyInfo( typeof( Muffins ), 3, 20, 0x9EA, 0 ) ); Add( new GenericBuyInfo( typeof( SackFlour ), 3, 20, 0x1039, 0 ) ); Add( new GenericBuyInfo( typeof( FrenchBread ), 5, 20, 0x98C, 0 ) ); - Add( new GenericBuyInfo( typeof( Cookies ), 3, 20, 0x160b, 0 ) ); + Add( new GenericBuyInfo( typeof( Cookies ), 3, 20, 0x160b, 0 ) ); Add( new GenericBuyInfo( typeof( CheesePizza ), 8, 10, 0x1040, 0 ) ); // OSI just has Pizza - Add( new GenericBuyInfo( typeof( JarHoney ), 3, 20, 0x9ec, 0 ) ); + Add( new GenericBuyInfo( typeof( JarHoney ), 3, 20, 0x9ec, 0 ) ); Add (new GenericBuyInfo( typeof( BowlFlour ), 7, 20, 0xA1E, 0 ) ); - } - } + } + } - public class InternalSellInfo : GenericSellInfo - { - public InternalSellInfo() - { - Add( typeof( BreadLoaf ), 3 ); - Add( typeof( FrenchBread ), 1 ); - Add( typeof( Cake ), 5 ); - Add( typeof( Cookies ), 3 ); - Add( typeof( Muffins ), 2 ); - Add( typeof( CheesePizza ), 4 ); - Add( typeof( ApplePie ), 5 ); - Add( typeof( PeachCobbler ), 5 ); - Add( typeof( Quiche ), 6 ); - Add( typeof( Dough ), 4 ); - Add( typeof( JarHoney ), 1 ); + public class InternalSellInfo : GenericSellInfo + { + public InternalSellInfo() + { + Add( typeof( BreadLoaf ), 3 ); + Add( typeof( FrenchBread ), 1 ); + Add( typeof( Cake ), 5 ); + Add( typeof( Cookies ), 3 ); + Add( typeof( Muffins ), 2 ); + Add( typeof( CheesePizza ), 4 ); + Add( typeof( ApplePie ), 5 ); + Add( typeof( PeachCobbler ), 5 ); + Add( typeof( Quiche ), 6 ); + Add( typeof( Dough ), 4 ); + Add( typeof( JarHoney ), 1 ); Add( typeof( Pitcher ), 5 ); - Add( typeof( SackFlour ), 1 ); - Add( typeof( Eggs ), 1 ); - } - } - } -} \ No newline at end of file + Add( typeof( SackFlour ), 1 ); + Add( typeof( Eggs ), 1 ); + } + } + } +} diff --git a/Scripts/Mobiles/Vendors/SBInfo/SBBanker.cs b/Scripts/Mobiles/Vendors/SBInfo/SBBanker.cs index 986b168cb..10a66a7b9 100644 --- a/Scripts/Mobiles/Vendors/SBInfo/SBBanker.cs +++ b/Scripts/Mobiles/Vendors/SBInfo/SBBanker.cs @@ -13,8 +13,8 @@ namespace Server.Mobiles { } - public override IShopSellInfo SellInfo { get { return m_SellInfo; } } - public override List BuyInfo { get { return m_BuyInfo; } } + public override IShopSellInfo SellInfo => m_SellInfo; + public override List BuyInfo => m_BuyInfo; public class InternalBuyInfo : List { @@ -35,4 +35,4 @@ namespace Server.Mobiles } } } -} \ No newline at end of file +} diff --git a/Scripts/Mobiles/Vendors/SBInfo/SBBard.cs b/Scripts/Mobiles/Vendors/SBInfo/SBBard.cs index 6414fb161..32b0d61a6 100644 --- a/Scripts/Mobiles/Vendors/SBInfo/SBBard.cs +++ b/Scripts/Mobiles/Vendors/SBInfo/SBBard.cs @@ -1,42 +1,42 @@ -using System; -using System.Collections.Generic; -using Server.Items; +using System; +using System.Collections.Generic; +using Server.Items; -namespace Server.Mobiles -{ - public class SBBard: SBInfo - { - private List m_BuyInfo = new InternalBuyInfo(); - private IShopSellInfo m_SellInfo = new InternalSellInfo(); +namespace Server.Mobiles +{ + public class SBBard: SBInfo + { + private List m_BuyInfo = new InternalBuyInfo(); + private IShopSellInfo m_SellInfo = new InternalSellInfo(); - public SBBard() - { - } + public SBBard() + { + } - public override IShopSellInfo SellInfo { get { return m_SellInfo; } } - public override List BuyInfo { get { return m_BuyInfo; } } + public override IShopSellInfo SellInfo => m_SellInfo; + public override List BuyInfo => m_BuyInfo; - public class InternalBuyInfo : List - { - public InternalBuyInfo() - { - Add( new GenericBuyInfo( typeof( Drums ), 21, ( 10 ), 0x0E9C, 0 ) ); - Add( new GenericBuyInfo( typeof( Tambourine ), 21, ( 10 ), 0x0E9E, 0 ) ); - Add( new GenericBuyInfo( typeof( LapHarp ), 21, ( 10 ), 0x0EB2, 0 ) ); + public class InternalBuyInfo : List + { + public InternalBuyInfo() + { + Add( new GenericBuyInfo( typeof( Drums ), 21, ( 10 ), 0x0E9C, 0 ) ); + Add( new GenericBuyInfo( typeof( Tambourine ), 21, ( 10 ), 0x0E9E, 0 ) ); + Add( new GenericBuyInfo( typeof( LapHarp ), 21, ( 10 ), 0x0EB2, 0 ) ); Add( new GenericBuyInfo( typeof( Lute ), 21, ( 10 ), 0x0EB3, 0 ) ); - } - } + } + } - public class InternalSellInfo : GenericSellInfo - { - public InternalSellInfo() - { - Add( typeof( LapHarp ), 10 ); - Add( typeof( Lute ), 10 ); - Add( typeof( Drums ), 10 ); - Add( typeof( Harp ), 10 ); - Add( typeof( Tambourine ), 10 ); - } - } - } -} \ No newline at end of file + public class InternalSellInfo : GenericSellInfo + { + public InternalSellInfo() + { + Add( typeof( LapHarp ), 10 ); + Add( typeof( Lute ), 10 ); + Add( typeof( Drums ), 10 ); + Add( typeof( Harp ), 10 ); + Add( typeof( Tambourine ), 10 ); + } + } + } +} diff --git a/Scripts/Mobiles/Vendors/SBInfo/SBBarkeeper.cs b/Scripts/Mobiles/Vendors/SBInfo/SBBarkeeper.cs index 3a2a91849..1570d9f6b 100644 --- a/Scripts/Mobiles/Vendors/SBInfo/SBBarkeeper.cs +++ b/Scripts/Mobiles/Vendors/SBInfo/SBBarkeeper.cs @@ -13,8 +13,8 @@ namespace Server.Mobiles { } - public override IShopSellInfo SellInfo { get { return m_SellInfo; } } - public override List BuyInfo { get { return m_BuyInfo; } } + public override IShopSellInfo SellInfo => m_SellInfo; + public override List BuyInfo => m_BuyInfo; public class InternalBuyInfo : List { @@ -106,4 +106,4 @@ namespace Server.Mobiles } } } -} \ No newline at end of file +} diff --git a/Scripts/Mobiles/Vendors/SBInfo/SBBeekeeper.cs b/Scripts/Mobiles/Vendors/SBInfo/SBBeekeeper.cs index 18ba5ef6f..b3737caa5 100644 --- a/Scripts/Mobiles/Vendors/SBInfo/SBBeekeeper.cs +++ b/Scripts/Mobiles/Vendors/SBInfo/SBBeekeeper.cs @@ -13,8 +13,8 @@ namespace Server.Mobiles { } - public override IShopSellInfo SellInfo { get { return m_SellInfo; } } - public override List BuyInfo { get { return m_BuyInfo; } } + public override IShopSellInfo SellInfo => m_SellInfo; + public override List BuyInfo => m_BuyInfo; public class InternalBuyInfo : List { @@ -34,4 +34,4 @@ namespace Server.Mobiles } } } -} \ No newline at end of file +} diff --git a/Scripts/Mobiles/Vendors/SBInfo/SBBlacksmith.cs b/Scripts/Mobiles/Vendors/SBInfo/SBBlacksmith.cs index 11327d14b..768ed12b3 100644 --- a/Scripts/Mobiles/Vendors/SBInfo/SBBlacksmith.cs +++ b/Scripts/Mobiles/Vendors/SBInfo/SBBlacksmith.cs @@ -1,28 +1,28 @@ -using System; -using System.Collections.Generic; -using Server.Items; +using System; +using System.Collections.Generic; +using Server.Items; -namespace Server.Mobiles -{ - public class SBBlacksmith : SBInfo - { - private List m_BuyInfo = new InternalBuyInfo(); - private IShopSellInfo m_SellInfo = new InternalSellInfo(); +namespace Server.Mobiles +{ + public class SBBlacksmith : SBInfo + { + private List m_BuyInfo = new InternalBuyInfo(); + private IShopSellInfo m_SellInfo = new InternalSellInfo(); - public SBBlacksmith() - { - } + public SBBlacksmith() + { + } - public override IShopSellInfo SellInfo { get { return m_SellInfo; } } - public override List BuyInfo { get { return m_BuyInfo; } } + public override IShopSellInfo SellInfo => m_SellInfo; + public override List BuyInfo => m_BuyInfo; - public class InternalBuyInfo : List - { - public InternalBuyInfo() - { + public class InternalBuyInfo : List + { + public InternalBuyInfo() + { Add( new GenericBuyInfo( typeof( IronIngot ), 5, 16, 0x1BF2, 0 ) ); - Add( new GenericBuyInfo( typeof( Tongs ), 13, 14, 0xFBB, 0 ) ); - + Add( new GenericBuyInfo( typeof( Tongs ), 13, 14, 0xFBB, 0 ) ); + Add( new GenericBuyInfo( typeof( BronzeShield ), 66, 20, 0x1B72, 0 ) ); Add( new GenericBuyInfo( typeof( Buckler ), 50, 20, 0x1B73, 0 ) ); Add( new GenericBuyInfo( typeof( MetalKiteShield ), 123, 20, 0x1B74, 0 ) ); @@ -115,15 +115,15 @@ namespace Server.Mobiles Add( new GenericBuyInfo( typeof( Scepter ), 39, 20, 0x26BC, 0 ) ); Add( new GenericBuyInfo( typeof( BladedStaff ), 40, 20, 0x26BD, 0 ) ); } - } - } + } + } - public class InternalSellInfo : GenericSellInfo - { - public InternalSellInfo() - { - Add( typeof( Tongs ), 7 ); - Add( typeof( IronIngot ), 4 ); + public class InternalSellInfo : GenericSellInfo + { + public InternalSellInfo() + { + Add( typeof( Tongs ), 7 ); + Add( typeof( IronIngot ), 4 ); Add( typeof( Buckler ), 25 ); Add( typeof( BronzeShield ), 33 ); @@ -189,7 +189,7 @@ namespace Server.Mobiles Add( typeof( HeavyCrossbow ), 27 ); Add( typeof( Bow ), 17 ); - Add( typeof( Crossbow ), 23 ); + Add( typeof( Crossbow ), 23 ); if( Core.AOS ) { @@ -228,7 +228,7 @@ namespace Server.Mobiles Add( typeof( VikingSword ), 27 ); - } - } - } -} \ No newline at end of file + } + } + } +} diff --git a/Scripts/Mobiles/Vendors/SBInfo/SBBowyer.cs b/Scripts/Mobiles/Vendors/SBInfo/SBBowyer.cs index d5238e0e8..688c2aa2a 100644 --- a/Scripts/Mobiles/Vendors/SBInfo/SBBowyer.cs +++ b/Scripts/Mobiles/Vendors/SBInfo/SBBowyer.cs @@ -13,8 +13,8 @@ namespace Server.Mobiles { } - public override IShopSellInfo SellInfo { get { return m_SellInfo; } } - public override List BuyInfo { get { return m_BuyInfo; } } + public override IShopSellInfo SellInfo => m_SellInfo; + public override List BuyInfo => m_BuyInfo; public class InternalBuyInfo : List { @@ -32,4 +32,4 @@ namespace Server.Mobiles } } } -} \ No newline at end of file +} diff --git a/Scripts/Mobiles/Vendors/SBInfo/SBButcher.cs b/Scripts/Mobiles/Vendors/SBInfo/SBButcher.cs index 2f7933e2f..e61e09801 100644 --- a/Scripts/Mobiles/Vendors/SBInfo/SBButcher.cs +++ b/Scripts/Mobiles/Vendors/SBInfo/SBButcher.cs @@ -1,53 +1,53 @@ -using System; -using System.Collections.Generic; -using Server.Items; +using System; +using System.Collections.Generic; +using Server.Items; -namespace Server.Mobiles -{ - public class SBButcher : SBInfo - { - private List m_BuyInfo = new InternalBuyInfo(); - private IShopSellInfo m_SellInfo = new InternalSellInfo(); +namespace Server.Mobiles +{ + public class SBButcher : SBInfo + { + private List m_BuyInfo = new InternalBuyInfo(); + private IShopSellInfo m_SellInfo = new InternalSellInfo(); - public SBButcher() - { - } + public SBButcher() + { + } - public override IShopSellInfo SellInfo { get { return m_SellInfo; } } - public override List BuyInfo { get { return m_BuyInfo; } } + public override IShopSellInfo SellInfo => m_SellInfo; + public override List BuyInfo => m_BuyInfo; - public class InternalBuyInfo : List - { - public InternalBuyInfo() + public class InternalBuyInfo : List + { + public InternalBuyInfo() { Add( new GenericBuyInfo( typeof( Bacon ), 7, 20, 0x979, 0 ) ); - Add( new GenericBuyInfo( typeof( Ham ), 26, 20, 0x9C9, 0 ) ); + Add( new GenericBuyInfo( typeof( Ham ), 26, 20, 0x9C9, 0 ) ); Add( new GenericBuyInfo( typeof( Sausage ), 18, 20, 0x9C0, 0 ) ); Add( new GenericBuyInfo( typeof( RawChickenLeg ), 6, 20, 0x1607, 0 ) ); - Add( new GenericBuyInfo( typeof( RawBird ), 9, 20, 0x9B9, 0 ) ); + Add( new GenericBuyInfo( typeof( RawBird ), 9, 20, 0x9B9, 0 ) ); Add( new GenericBuyInfo( typeof( RawLambLeg ), 9, 20, 0x1609, 0 ) ); Add( new GenericBuyInfo( typeof( RawRibs ), 16, 20, 0x9F1, 0 ) ); Add( new GenericBuyInfo( typeof( ButcherKnife ), 13, 20, 0x13F6, 0 ) ); Add( new GenericBuyInfo( typeof( Cleaver ), 13, 20, 0xEC3, 0 ) ); - Add( new GenericBuyInfo( typeof( SkinningKnife ), 13, 20, 0xEC4, 0 ) ); - } - } + Add( new GenericBuyInfo( typeof( SkinningKnife ), 13, 20, 0xEC4, 0 ) ); + } + } - public class InternalSellInfo : GenericSellInfo - { - public InternalSellInfo() - { - Add( typeof( RawRibs ), 8 ); - Add( typeof( RawLambLeg ), 4 ); - Add( typeof( RawChickenLeg ), 3 ); - Add( typeof( RawBird ), 4 ); - Add( typeof( Bacon ), 3 ); - Add( typeof( Sausage ), 9 ); - Add( typeof( Ham ), 13 ); - Add( typeof( ButcherKnife ), 7 ); - Add( typeof( Cleaver ), 7 ); - Add( typeof( SkinningKnife ), 7 ); - } - } - } -} \ No newline at end of file + public class InternalSellInfo : GenericSellInfo + { + public InternalSellInfo() + { + Add( typeof( RawRibs ), 8 ); + Add( typeof( RawLambLeg ), 4 ); + Add( typeof( RawChickenLeg ), 3 ); + Add( typeof( RawBird ), 4 ); + Add( typeof( Bacon ), 3 ); + Add( typeof( Sausage ), 9 ); + Add( typeof( Ham ), 13 ); + Add( typeof( ButcherKnife ), 7 ); + Add( typeof( Cleaver ), 7 ); + Add( typeof( SkinningKnife ), 7 ); + } + } + } +} diff --git a/Scripts/Mobiles/Vendors/SBInfo/SBCarpenter.cs b/Scripts/Mobiles/Vendors/SBInfo/SBCarpenter.cs index f6f2789d5..0796187b8 100644 --- a/Scripts/Mobiles/Vendors/SBInfo/SBCarpenter.cs +++ b/Scripts/Mobiles/Vendors/SBInfo/SBCarpenter.cs @@ -13,8 +13,8 @@ namespace Server.Mobiles { } - public override IShopSellInfo SellInfo { get { return m_SellInfo; } } - public override List BuyInfo { get { return m_BuyInfo; } } + public override IShopSellInfo SellInfo => m_SellInfo; + public override List BuyInfo => m_BuyInfo; public class InternalBuyInfo : List { diff --git a/Scripts/Mobiles/Vendors/SBInfo/SBCobbler.cs b/Scripts/Mobiles/Vendors/SBInfo/SBCobbler.cs index e180ff184..6ddc9b14e 100644 --- a/Scripts/Mobiles/Vendors/SBInfo/SBCobbler.cs +++ b/Scripts/Mobiles/Vendors/SBInfo/SBCobbler.cs @@ -1,41 +1,41 @@ -using System; -using System.Collections.Generic; -using Server.Items; +using System; +using System.Collections.Generic; +using Server.Items; -namespace Server.Mobiles -{ - public class SBCobbler : SBInfo - { - private List m_BuyInfo = new InternalBuyInfo(); - private IShopSellInfo m_SellInfo = new InternalSellInfo(); +namespace Server.Mobiles +{ + public class SBCobbler : SBInfo + { + private List m_BuyInfo = new InternalBuyInfo(); + private IShopSellInfo m_SellInfo = new InternalSellInfo(); - public SBCobbler() - { - } + public SBCobbler() + { + } - public override IShopSellInfo SellInfo { get { return m_SellInfo; } } - public override List BuyInfo { get { return m_BuyInfo; } } + public override IShopSellInfo SellInfo => m_SellInfo; + public override List BuyInfo => m_BuyInfo; - public class InternalBuyInfo : List - { - public InternalBuyInfo() + public class InternalBuyInfo : List + { + public InternalBuyInfo() { Add( new GenericBuyInfo( typeof( ThighBoots ), 15, 20, 0x1711, Utility.RandomNeutralHue() ) ); Add( new GenericBuyInfo( typeof( Shoes ), 8, 20, 0x170f, Utility.RandomNeutralHue() ) ); Add( new GenericBuyInfo( typeof( Boots ), 10, 20, 0x170b, Utility.RandomNeutralHue() ) ); Add( new GenericBuyInfo( typeof( Sandals ), 5, 20, 0x170d, Utility.RandomNeutralHue() ) ); - } - } + } + } - public class InternalSellInfo : GenericSellInfo - { - public InternalSellInfo() - { - Add( typeof( Shoes ), 4 ); - Add( typeof( Boots ), 5 ); - Add( typeof( ThighBoots ), 7 ); - Add( typeof( Sandals ), 2 ); - } - } - } -} \ No newline at end of file + public class InternalSellInfo : GenericSellInfo + { + public InternalSellInfo() + { + Add( typeof( Shoes ), 4 ); + Add( typeof( Boots ), 5 ); + Add( typeof( ThighBoots ), 7 ); + Add( typeof( Sandals ), 2 ); + } + } + } +} diff --git a/Scripts/Mobiles/Vendors/SBInfo/SBCook.cs b/Scripts/Mobiles/Vendors/SBInfo/SBCook.cs index 5de7e60a3..ca5b425bc 100644 --- a/Scripts/Mobiles/Vendors/SBInfo/SBCook.cs +++ b/Scripts/Mobiles/Vendors/SBInfo/SBCook.cs @@ -1,25 +1,25 @@ -using System; -using System.Collections.Generic; -using Server.Items; +using System; +using System.Collections.Generic; +using Server.Items; -namespace Server.Mobiles -{ - public class SBCook : SBInfo - { - private List m_BuyInfo = new InternalBuyInfo(); - private IShopSellInfo m_SellInfo = new InternalSellInfo(); +namespace Server.Mobiles +{ + public class SBCook : SBInfo + { + private List m_BuyInfo = new InternalBuyInfo(); + private IShopSellInfo m_SellInfo = new InternalSellInfo(); - public SBCook() - { - } + public SBCook() + { + } - public override IShopSellInfo SellInfo { get { return m_SellInfo; } } - public override List BuyInfo { get { return m_BuyInfo; } } + public override IShopSellInfo SellInfo => m_SellInfo; + public override List BuyInfo => m_BuyInfo; - public class InternalBuyInfo : List - { - public InternalBuyInfo() - { + public class InternalBuyInfo : List + { + public InternalBuyInfo() + { Add( new GenericBuyInfo( typeof( BreadLoaf ), 5, 20, 0x103B, 0 ) ); Add( new GenericBuyInfo( typeof( BreadLoaf ), 5, 20, 0x103C, 0 ) ); Add( new GenericBuyInfo( typeof( ApplePie ), 7, 20, 0x1041, 0 ) ); //OSI just has Pie, not Apple/Fruit/Meat @@ -50,13 +50,13 @@ namespace Server.Mobiles Add( new GenericBuyInfo( typeof( FlourSifter ), 2, 20, 0x103E, 0 ) ); Add( new GenericBuyInfo( "1044567", typeof( Skillet ), 3, 20, 0x97F, 0 ) ); - } - } + } + } - public class InternalSellInfo : GenericSellInfo - { - public InternalSellInfo() - { + public class InternalSellInfo : GenericSellInfo + { + public InternalSellInfo() + { Add( typeof( CheeseWheel ), 12 ); Add( typeof( CookedBird ), 8 ); Add( typeof( RoastPig ), 53 ); @@ -83,7 +83,7 @@ namespace Server.Mobiles Add( typeof( PewterBowlOfPotatos ), 1 ); Add( typeof( WoodenBowlOfStew ), 1 ); Add( typeof( WoodenBowlOfTomatoSoup ), 1 ); - } - } - } -} \ No newline at end of file + } + } + } +} diff --git a/Scripts/Mobiles/Vendors/SBInfo/SBFarmer.cs b/Scripts/Mobiles/Vendors/SBInfo/SBFarmer.cs index af2fd7110..45df8d8d1 100644 --- a/Scripts/Mobiles/Vendors/SBInfo/SBFarmer.cs +++ b/Scripts/Mobiles/Vendors/SBInfo/SBFarmer.cs @@ -1,25 +1,25 @@ -using System; -using System.Collections.Generic; -using Server.Items; +using System; +using System.Collections.Generic; +using Server.Items; -namespace Server.Mobiles -{ - public class SBFarmer : SBInfo - { - private List m_BuyInfo = new InternalBuyInfo(); - private IShopSellInfo m_SellInfo = new InternalSellInfo(); +namespace Server.Mobiles +{ + public class SBFarmer : SBInfo + { + private List m_BuyInfo = new InternalBuyInfo(); + private IShopSellInfo m_SellInfo = new InternalSellInfo(); - public SBFarmer() - { - } + public SBFarmer() + { + } - public override IShopSellInfo SellInfo { get { return m_SellInfo; } } - public override List BuyInfo { get { return m_BuyInfo; } } + public override IShopSellInfo SellInfo => m_SellInfo; + public override List BuyInfo => m_BuyInfo; - public class InternalBuyInfo : List - { - public InternalBuyInfo() - { + public class InternalBuyInfo : List + { + public InternalBuyInfo() + { Add( new GenericBuyInfo( typeof( Cabbage ), 5, 20, 0xC7B, 0 ) ); Add( new GenericBuyInfo( typeof( Cantaloupe ), 6, 20, 0xC79, 0 ) ); Add( new GenericBuyInfo( typeof( Carrot ), 3, 20, 0xC78, 0 ) ); @@ -43,13 +43,13 @@ namespace Server.Mobiles Add( new GenericBuyInfo( typeof( Apple ), 3, 20, 0x9D0, 0 ) ); Add( new GenericBuyInfo( typeof( SheafOfHay ), 2, 20, 0xF36, 0 ) ); - } - } + } + } - public class InternalSellInfo : GenericSellInfo - { - public InternalSellInfo() - { + public class InternalSellInfo : GenericSellInfo + { + public InternalSellInfo() + { Add( typeof( Pitcher ), 5 ); Add( typeof( Eggs ), 1 ); Add( typeof( Apple ), 1 ); @@ -70,7 +70,7 @@ namespace Server.Mobiles Add( typeof( Peach ), 1 ); Add( typeof( Pear ), 1 ); Add( typeof( SheafOfHay ), 1 ); - } - } - } -} \ No newline at end of file + } + } + } +} diff --git a/Scripts/Mobiles/Vendors/SBInfo/SBFisherman.cs b/Scripts/Mobiles/Vendors/SBInfo/SBFisherman.cs index ee586e0d4..aac28e62e 100644 --- a/Scripts/Mobiles/Vendors/SBInfo/SBFisherman.cs +++ b/Scripts/Mobiles/Vendors/SBInfo/SBFisherman.cs @@ -1,25 +1,25 @@ -using System; -using System.Collections.Generic; -using Server.Items; +using System; +using System.Collections.Generic; +using Server.Items; -namespace Server.Mobiles -{ - public class SBFisherman : SBInfo - { - private List m_BuyInfo = new InternalBuyInfo(); - private IShopSellInfo m_SellInfo = new InternalSellInfo(); +namespace Server.Mobiles +{ + public class SBFisherman : SBInfo + { + private List m_BuyInfo = new InternalBuyInfo(); + private IShopSellInfo m_SellInfo = new InternalSellInfo(); - public SBFisherman() - { - } + public SBFisherman() + { + } - public override IShopSellInfo SellInfo { get { return m_SellInfo; } } - public override List BuyInfo { get { return m_BuyInfo; } } + public override IShopSellInfo SellInfo => m_SellInfo; + public override List BuyInfo => m_BuyInfo; - public class InternalBuyInfo : List - { - public InternalBuyInfo() - { + public class InternalBuyInfo : List + { + public InternalBuyInfo() + { Add( new GenericBuyInfo( typeof( RawFishSteak ), 3, 20, 0x97A, 0 ) ); //TODO: Add( new GenericBuyInfo( typeof( SmallFish ), 3, 20, 0xDD6, 0 ) ); //TODO: Add( new GenericBuyInfo( typeof( SmallFish ), 3, 20, 0xDD7, 0 ) ); @@ -38,18 +38,18 @@ namespace Server.Mobiles Add( new GenericBuyInfo( typeof( AquariumEastDeed ), 250002, 20, 0x14F0, 0 ) ); Add( new GenericBuyInfo( typeof( NewAquariumBook ), 15, 20, 0xFF2, 0 ) ); #endregion - } - } + } + } - public class InternalSellInfo : GenericSellInfo - { - public InternalSellInfo() - { + public class InternalSellInfo : GenericSellInfo + { + public InternalSellInfo() + { Add( typeof( RawFishSteak ), 1 ); Add( typeof( Fish ), 1 ); //TODO: Add( typeof( SmallFish ), 1 ); Add( typeof( FishingPole ), 7 ); - } - } - } -} \ No newline at end of file + } + } + } +} diff --git a/Scripts/Mobiles/Vendors/SBInfo/SBFortuneTeller.cs b/Scripts/Mobiles/Vendors/SBInfo/SBFortuneTeller.cs index 0e301c0e7..06f8f2184 100644 --- a/Scripts/Mobiles/Vendors/SBInfo/SBFortuneTeller.cs +++ b/Scripts/Mobiles/Vendors/SBInfo/SBFortuneTeller.cs @@ -13,8 +13,8 @@ namespace Server.Mobiles { } - public override IShopSellInfo SellInfo { get { return m_SellInfo; } } - public override List BuyInfo { get { return m_BuyInfo; } } + public override IShopSellInfo SellInfo => m_SellInfo; + public override List BuyInfo => m_BuyInfo; public class InternalBuyInfo : List { @@ -32,4 +32,4 @@ namespace Server.Mobiles } } } -} \ No newline at end of file +} diff --git a/Scripts/Mobiles/Vendors/SBInfo/SBFurtrader.cs b/Scripts/Mobiles/Vendors/SBInfo/SBFurtrader.cs index 90c3575f8..fcb3e16f5 100644 --- a/Scripts/Mobiles/Vendors/SBInfo/SBFurtrader.cs +++ b/Scripts/Mobiles/Vendors/SBInfo/SBFurtrader.cs @@ -1,35 +1,35 @@ -using System; -using System.Collections.Generic; -using Server.Items; +using System; +using System.Collections.Generic; +using Server.Items; -namespace Server.Mobiles -{ - public class SBFurtrader : SBInfo - { - private List m_BuyInfo = new InternalBuyInfo(); - private IShopSellInfo m_SellInfo = new InternalSellInfo(); +namespace Server.Mobiles +{ + public class SBFurtrader : SBInfo + { + private List m_BuyInfo = new InternalBuyInfo(); + private IShopSellInfo m_SellInfo = new InternalSellInfo(); - public SBFurtrader() - { - } + public SBFurtrader() + { + } - public override IShopSellInfo SellInfo { get { return m_SellInfo; } } - public override List BuyInfo { get { return m_BuyInfo; } } + public override IShopSellInfo SellInfo => m_SellInfo; + public override List BuyInfo => m_BuyInfo; - public class InternalBuyInfo : List - { - public InternalBuyInfo() - { - Add( new GenericBuyInfo( typeof( Hides ), 3, 40, 0x1079, 0 ) ); - } - } + public class InternalBuyInfo : List + { + public InternalBuyInfo() + { + Add( new GenericBuyInfo( typeof( Hides ), 3, 40, 0x1079, 0 ) ); + } + } - public class InternalSellInfo : GenericSellInfo - { - public InternalSellInfo() - { - Add( typeof( Hides ), 2 ); - } - } - } -} + public class InternalSellInfo : GenericSellInfo + { + public InternalSellInfo() + { + Add( typeof( Hides ), 2 ); + } + } + } +} diff --git a/Scripts/Mobiles/Vendors/SBInfo/SBGlassblower.cs b/Scripts/Mobiles/Vendors/SBInfo/SBGlassblower.cs index 9b515e8f1..1d004cb5e 100644 --- a/Scripts/Mobiles/Vendors/SBInfo/SBGlassblower.cs +++ b/Scripts/Mobiles/Vendors/SBInfo/SBGlassblower.cs @@ -13,8 +13,8 @@ namespace Server.Mobiles { } - public override IShopSellInfo SellInfo { get { return m_SellInfo; } } - public override List BuyInfo { get { return m_BuyInfo; } } + public override IShopSellInfo SellInfo => m_SellInfo; + public override List BuyInfo => m_BuyInfo; public class InternalBuyInfo : List { @@ -40,9 +40,9 @@ namespace Server.Mobiles Add( new GenericBuyInfo( typeof( SpidersSilk ), 3, 20, 0xF8D, 0 ) ); Add( new GenericBuyInfo( typeof( SulfurousAsh ), 3, 20, 0xF8C, 0 ) ); - Add( new GenericBuyInfo( typeof( Bottle ), 5, 100, 0xF0E, 0 ) ); + Add( new GenericBuyInfo( typeof( Bottle ), 5, 100, 0xF0E, 0 ) ); - Add( new GenericBuyInfo( typeof( HeatingStand ), 2, 100, 0x1849, 0 ) ); + Add( new GenericBuyInfo( typeof( HeatingStand ), 2, 100, 0x1849, 0 ) ); Add( new GenericBuyInfo( "Crafting Glass With Glassblowing", typeof( GlassblowingBook ), 10637, 30, 0xFF4, 0 ) ); Add( new GenericBuyInfo( "Finding Glass-Quality Sand", typeof( SandMiningBook ), 10637, 30, 0xFF4, 0 ) ); @@ -54,14 +54,14 @@ namespace Server.Mobiles { public InternalSellInfo() { - Add( typeof( BlackPearl ), 3 ); - Add( typeof( Bloodmoss ), 3 ); - Add( typeof( MandrakeRoot ), 2 ); - Add( typeof( Garlic ), 2 ); - Add( typeof( Ginseng ), 2 ); - Add( typeof( Nightshade ), 2 ); - Add( typeof( SpidersSilk ), 2 ); - Add( typeof( SulfurousAsh ), 2 ); + Add( typeof( BlackPearl ), 3 ); + Add( typeof( Bloodmoss ), 3 ); + Add( typeof( MandrakeRoot ), 2 ); + Add( typeof( Garlic ), 2 ); + Add( typeof( Ginseng ), 2 ); + Add( typeof( Nightshade ), 2 ); + Add( typeof( SpidersSilk ), 2 ); + Add( typeof( SulfurousAsh ), 2 ); Add( typeof( Bottle ), 3 ); Add( typeof( MortarPestle ), 4 ); @@ -80,4 +80,4 @@ namespace Server.Mobiles } } } -} \ No newline at end of file +} diff --git a/Scripts/Mobiles/Vendors/SBInfo/SBHairStylist.cs b/Scripts/Mobiles/Vendors/SBInfo/SBHairStylist.cs index 78647e0a3..f47ec1792 100644 --- a/Scripts/Mobiles/Vendors/SBInfo/SBHairStylist.cs +++ b/Scripts/Mobiles/Vendors/SBInfo/SBHairStylist.cs @@ -1,39 +1,39 @@ -using System; -using System.Collections.Generic; -using Server.Items; +using System; +using System.Collections.Generic; +using Server.Items; -namespace Server.Mobiles -{ - public class SBHairStylist : SBInfo - { - private List m_BuyInfo = new InternalBuyInfo(); - private IShopSellInfo m_SellInfo = new InternalSellInfo(); +namespace Server.Mobiles +{ + public class SBHairStylist : SBInfo + { + private List m_BuyInfo = new InternalBuyInfo(); + private IShopSellInfo m_SellInfo = new InternalSellInfo(); - public SBHairStylist() - { - } + public SBHairStylist() + { + } - public override IShopSellInfo SellInfo { get { return m_SellInfo; } } - public override List BuyInfo { get { return m_BuyInfo; } } + public override IShopSellInfo SellInfo => m_SellInfo; + public override List BuyInfo => m_BuyInfo; - public class InternalBuyInfo : List - { - public InternalBuyInfo() - { - Add( new GenericBuyInfo( "special beard dye", typeof( SpecialBeardDye ), 500000, 20, 0xE26, 0 ) ); - Add( new GenericBuyInfo( "special hair dye", typeof( SpecialHairDye ), 500000, 20, 0xE26, 0 ) ); - Add( new GenericBuyInfo( "1041060", typeof( HairDye ), 60, 20, 0xEFF, 0 ) ); - } - } + public class InternalBuyInfo : List + { + public InternalBuyInfo() + { + Add( new GenericBuyInfo( "special beard dye", typeof( SpecialBeardDye ), 500000, 20, 0xE26, 0 ) ); + Add( new GenericBuyInfo( "special hair dye", typeof( SpecialHairDye ), 500000, 20, 0xE26, 0 ) ); + Add( new GenericBuyInfo( "1041060", typeof( HairDye ), 60, 20, 0xEFF, 0 ) ); + } + } - public class InternalSellInfo : GenericSellInfo - { - public InternalSellInfo() - { - Add( typeof( HairDye ), 30 ); - Add( typeof( SpecialBeardDye ), 250000 ); - Add( typeof( SpecialHairDye ), 250000 ); - } - } - } -} \ No newline at end of file + public class InternalSellInfo : GenericSellInfo + { + public InternalSellInfo() + { + Add( typeof( HairDye ), 30 ); + Add( typeof( SpecialBeardDye ), 250000 ); + Add( typeof( SpecialHairDye ), 250000 ); + } + } + } +} diff --git a/Scripts/Mobiles/Vendors/SBInfo/SBHealer.cs b/Scripts/Mobiles/Vendors/SBInfo/SBHealer.cs index 95846de1a..e15a09407 100644 --- a/Scripts/Mobiles/Vendors/SBInfo/SBHealer.cs +++ b/Scripts/Mobiles/Vendors/SBInfo/SBHealer.cs @@ -13,8 +13,8 @@ namespace Server.Mobiles { } - public override IShopSellInfo SellInfo { get { return m_SellInfo; } } - public override List BuyInfo { get { return m_BuyInfo; } } + public override IShopSellInfo SellInfo => m_SellInfo; + public override List BuyInfo => m_BuyInfo; public class InternalBuyInfo : List { @@ -40,4 +40,4 @@ namespace Server.Mobiles } } } -} \ No newline at end of file +} diff --git a/Scripts/Mobiles/Vendors/SBInfo/SBHerbalist.cs b/Scripts/Mobiles/Vendors/SBInfo/SBHerbalist.cs index f5cfbd8ab..c4099a8db 100644 --- a/Scripts/Mobiles/Vendors/SBInfo/SBHerbalist.cs +++ b/Scripts/Mobiles/Vendors/SBInfo/SBHerbalist.cs @@ -1,47 +1,47 @@ -using System; -using System.Collections.Generic; -using Server.Items; +using System; +using System.Collections.Generic; +using Server.Items; -namespace Server.Mobiles -{ - public class SBHerbalist : SBInfo - { - private List m_BuyInfo = new InternalBuyInfo(); - private IShopSellInfo m_SellInfo = new InternalSellInfo(); +namespace Server.Mobiles +{ + public class SBHerbalist : SBInfo + { + private List m_BuyInfo = new InternalBuyInfo(); + private IShopSellInfo m_SellInfo = new InternalSellInfo(); - public SBHerbalist() - { - } + public SBHerbalist() + { + } - public override IShopSellInfo SellInfo { get { return m_SellInfo; } } - public override List BuyInfo { get { return m_BuyInfo; } } + public override IShopSellInfo SellInfo => m_SellInfo; + public override List BuyInfo => m_BuyInfo; - public class InternalBuyInfo : List - { - public InternalBuyInfo() - { - Add( new GenericBuyInfo( typeof( Ginseng ), 3, 20, 0xF85, 0 ) ); - Add( new GenericBuyInfo( typeof( Garlic ), 3, 20, 0xF84, 0 ) ); - Add( new GenericBuyInfo( typeof( MandrakeRoot ), 3, 20, 0xF86, 0 ) ); - Add( new GenericBuyInfo( typeof( Nightshade ), 3, 20, 0xF88, 0 ) ); - Add( new GenericBuyInfo( typeof( Bloodmoss ), 5, 20, 0xF7B, 0 ) ); + public class InternalBuyInfo : List + { + public InternalBuyInfo() + { + Add( new GenericBuyInfo( typeof( Ginseng ), 3, 20, 0xF85, 0 ) ); + Add( new GenericBuyInfo( typeof( Garlic ), 3, 20, 0xF84, 0 ) ); + Add( new GenericBuyInfo( typeof( MandrakeRoot ), 3, 20, 0xF86, 0 ) ); + Add( new GenericBuyInfo( typeof( Nightshade ), 3, 20, 0xF88, 0 ) ); + Add( new GenericBuyInfo( typeof( Bloodmoss ), 5, 20, 0xF7B, 0 ) ); Add( new GenericBuyInfo( typeof( MortarPestle ), 8, 20, 0xE9B, 0 ) ); Add( new GenericBuyInfo( typeof( Bottle ), 5, 20, 0xF0E, 0 ) ); - } - } + } + } - public class InternalSellInfo : GenericSellInfo - { - public InternalSellInfo() - { - Add( typeof( Bloodmoss ), 3 ); - Add( typeof( MandrakeRoot ), 2 ); - Add( typeof( Garlic ), 2 ); - Add( typeof( Ginseng ), 2 ); - Add( typeof( Nightshade ), 2 ); - Add( typeof( Bottle ), 3 ); - Add( typeof( MortarPestle ), 4 ); - } - } - } -} \ No newline at end of file + public class InternalSellInfo : GenericSellInfo + { + public InternalSellInfo() + { + Add( typeof( Bloodmoss ), 3 ); + Add( typeof( MandrakeRoot ), 2 ); + Add( typeof( Garlic ), 2 ); + Add( typeof( Ginseng ), 2 ); + Add( typeof( Nightshade ), 2 ); + Add( typeof( Bottle ), 3 ); + Add( typeof( MortarPestle ), 4 ); + } + } + } +} diff --git a/Scripts/Mobiles/Vendors/SBInfo/SBHolyMage.cs b/Scripts/Mobiles/Vendors/SBInfo/SBHolyMage.cs index d44027c33..d46b5d51f 100644 --- a/Scripts/Mobiles/Vendors/SBInfo/SBHolyMage.cs +++ b/Scripts/Mobiles/Vendors/SBInfo/SBHolyMage.cs @@ -13,8 +13,8 @@ namespace Server.Mobiles { } - public override IShopSellInfo SellInfo { get { return m_SellInfo; } } - public override List BuyInfo { get { return m_BuyInfo; } } + public override IShopSellInfo SellInfo => m_SellInfo; + public override List BuyInfo => m_BuyInfo; public class InternalBuyInfo : List { @@ -30,7 +30,7 @@ namespace Server.Mobiles Add( new GenericBuyInfo( typeof( RefreshPotion ), 15, 20, 0xF0B, 0 ) ); Add( new GenericBuyInfo( typeof( AgilityPotion ), 15, 20, 0xF08, 0 ) ); - Add( new GenericBuyInfo( typeof( NightSightPotion ), 15, 20, 0xF06, 0 ) ); + Add( new GenericBuyInfo( typeof( NightSightPotion ), 15, 20, 0xF06, 0 ) ); Add( new GenericBuyInfo( typeof( LesserHealPotion ), 15, 20, 0xF0C, 0 ) ); Add( new GenericBuyInfo( typeof( StrengthPotion ), 15, 20, 0xF09, 0 ) ); Add( new GenericBuyInfo( typeof( LesserCurePotion ), 15, 20, 0xF07, 0 ) ); @@ -64,14 +64,14 @@ namespace Server.Mobiles { public InternalSellInfo() { - Add( typeof( BlackPearl ), 3 ); - Add( typeof( Bloodmoss ), 3 ); - Add( typeof( MandrakeRoot ), 2 ); - Add( typeof( Garlic ), 2 ); - Add( typeof( Ginseng ), 2 ); - Add( typeof( Nightshade ), 2 ); - Add( typeof( SpidersSilk ), 2 ); - Add( typeof( SulfurousAsh ), 2 ); + Add( typeof( BlackPearl ), 3 ); + Add( typeof( Bloodmoss ), 3 ); + Add( typeof( MandrakeRoot ), 2 ); + Add( typeof( Garlic ), 2 ); + Add( typeof( Ginseng ), 2 ); + Add( typeof( Nightshade ), 2 ); + Add( typeof( SpidersSilk ), 2 ); + Add( typeof( SulfurousAsh ), 2 ); Add( typeof( RecallRune ), 8 ); Add( typeof( Spellbook ), 9 ); Add( typeof( BlankScroll ), 3 ); @@ -90,4 +90,4 @@ namespace Server.Mobiles } } } -} \ No newline at end of file +} diff --git a/Scripts/Mobiles/Vendors/SBInfo/SBHouseDeed.cs b/Scripts/Mobiles/Vendors/SBInfo/SBHouseDeed.cs index 6be76159c..ab3485779 100644 --- a/Scripts/Mobiles/Vendors/SBInfo/SBHouseDeed.cs +++ b/Scripts/Mobiles/Vendors/SBInfo/SBHouseDeed.cs @@ -13,8 +13,8 @@ namespace Server.Mobiles { } - public override IShopSellInfo SellInfo { get { return m_SellInfo; } } - public override List BuyInfo { get { return m_BuyInfo; } } + public override IShopSellInfo SellInfo => m_SellInfo; + public override List BuyInfo => m_BuyInfo; public class InternalBuyInfo : List { diff --git a/Scripts/Mobiles/Vendors/SBInfo/SBInnKeeper.cs b/Scripts/Mobiles/Vendors/SBInfo/SBInnKeeper.cs index 0a4e5eaa0..2d1e0d818 100644 --- a/Scripts/Mobiles/Vendors/SBInfo/SBInnKeeper.cs +++ b/Scripts/Mobiles/Vendors/SBInfo/SBInnKeeper.cs @@ -13,8 +13,8 @@ namespace Server.Mobiles { } - public override IShopSellInfo SellInfo { get { return m_SellInfo; } } - public override List BuyInfo { get { return m_BuyInfo; } } + public override IShopSellInfo SellInfo => m_SellInfo; + public override List BuyInfo => m_BuyInfo; public class InternalBuyInfo : List { @@ -112,4 +112,4 @@ namespace Server.Mobiles } } } -} \ No newline at end of file +} diff --git a/Scripts/Mobiles/Vendors/SBInfo/SBJewel.cs b/Scripts/Mobiles/Vendors/SBInfo/SBJewel.cs index eaf773f41..e1af62df0 100644 --- a/Scripts/Mobiles/Vendors/SBInfo/SBJewel.cs +++ b/Scripts/Mobiles/Vendors/SBInfo/SBJewel.cs @@ -13,8 +13,8 @@ namespace Server.Mobiles { } - public override IShopSellInfo SellInfo { get { return m_SellInfo; } } - public override List BuyInfo { get { return m_BuyInfo; } } + public override IShopSellInfo SellInfo => m_SellInfo; + public override List BuyInfo => m_BuyInfo; public class InternalBuyInfo : List { diff --git a/Scripts/Mobiles/Vendors/SBInfo/SBKeeperOfChivalry.cs b/Scripts/Mobiles/Vendors/SBInfo/SBKeeperOfChivalry.cs index b534666a4..573529f54 100644 --- a/Scripts/Mobiles/Vendors/SBInfo/SBKeeperOfChivalry.cs +++ b/Scripts/Mobiles/Vendors/SBInfo/SBKeeperOfChivalry.cs @@ -13,8 +13,8 @@ namespace Server.Mobiles { } - public override IShopSellInfo SellInfo { get { return m_SellInfo; } } - public override List BuyInfo { get { return m_BuyInfo; } } + public override IShopSellInfo SellInfo => m_SellInfo; + public override List BuyInfo => m_BuyInfo; public class InternalBuyInfo : List { @@ -31,4 +31,4 @@ namespace Server.Mobiles } } } -} \ No newline at end of file +} diff --git a/Scripts/Mobiles/Vendors/SBInfo/SBLeatherWorker.cs b/Scripts/Mobiles/Vendors/SBInfo/SBLeatherWorker.cs index 678a8155e..b6ee16acc 100644 --- a/Scripts/Mobiles/Vendors/SBInfo/SBLeatherWorker.cs +++ b/Scripts/Mobiles/Vendors/SBInfo/SBLeatherWorker.cs @@ -1,37 +1,37 @@ -using System; -using System.Collections.Generic; -using Server.Items; +using System; +using System.Collections.Generic; +using Server.Items; -namespace Server.Mobiles -{ - public class SBLeatherWorker: SBInfo - { - private List m_BuyInfo = new InternalBuyInfo(); - private IShopSellInfo m_SellInfo = new InternalSellInfo(); +namespace Server.Mobiles +{ + public class SBLeatherWorker: SBInfo + { + private List m_BuyInfo = new InternalBuyInfo(); + private IShopSellInfo m_SellInfo = new InternalSellInfo(); - public SBLeatherWorker() - { - } + public SBLeatherWorker() + { + } - public override IShopSellInfo SellInfo { get { return m_SellInfo; } } - public override List BuyInfo { get { return m_BuyInfo; } } + public override IShopSellInfo SellInfo => m_SellInfo; + public override List BuyInfo => m_BuyInfo; - public class InternalBuyInfo : List - { - public InternalBuyInfo() - { - Add( new GenericBuyInfo( typeof( Hides ), 4, 999, 0x1078, 0 ) ); - Add( new GenericBuyInfo( typeof( ThighBoots ), 56, 10, 0x1711, 0 ) ); - } - } + public class InternalBuyInfo : List + { + public InternalBuyInfo() + { + Add( new GenericBuyInfo( typeof( Hides ), 4, 999, 0x1078, 0 ) ); + Add( new GenericBuyInfo( typeof( ThighBoots ), 56, 10, 0x1711, 0 ) ); + } + } - public class InternalSellInfo : GenericSellInfo - { - public InternalSellInfo() - { - Add( typeof( Hides ), 2 ); - Add( typeof( ThighBoots ), 28 ); - } - } - } -} + public class InternalSellInfo : GenericSellInfo + { + public InternalSellInfo() + { + Add( typeof( Hides ), 2 ); + Add( typeof( ThighBoots ), 28 ); + } + } + } +} diff --git a/Scripts/Mobiles/Vendors/SBInfo/SBMage.cs b/Scripts/Mobiles/Vendors/SBInfo/SBMage.cs index 1b6e9cf16..36e45f126 100644 --- a/Scripts/Mobiles/Vendors/SBInfo/SBMage.cs +++ b/Scripts/Mobiles/Vendors/SBInfo/SBMage.cs @@ -13,8 +13,8 @@ namespace Server.Mobiles { } - public override IShopSellInfo SellInfo { get { return m_SellInfo; } } - public override List BuyInfo { get { return m_BuyInfo; } } + public override IShopSellInfo SellInfo => m_SellInfo; + public override List BuyInfo => m_BuyInfo; public class InternalBuyInfo : List { @@ -24,7 +24,7 @@ namespace Server.Mobiles if ( Core.AOS ) Add( new GenericBuyInfo( typeof( NecromancerSpellbook ), 115, 10, 0x2253, 0 ) ); - + Add( new GenericBuyInfo( typeof( ScribesPen ), 8, 10, 0xFBF, 0 ) ); Add( new GenericBuyInfo( typeof( BlankScroll ), 5, 20, 0x0E34, 0 ) ); @@ -83,14 +83,14 @@ namespace Server.Mobiles public InternalSellInfo() { Add( typeof( WizardsHat ), 15 ); - Add( typeof( BlackPearl ), 3 ); - Add( typeof( Bloodmoss ),4 ); - Add( typeof( MandrakeRoot ), 2 ); - Add( typeof( Garlic ), 2 ); - Add( typeof( Ginseng ), 2 ); - Add( typeof( Nightshade ), 2 ); - Add( typeof( SpidersSilk ), 2 ); - Add( typeof( SulfurousAsh ), 2 ); + Add( typeof( BlackPearl ), 3 ); + Add( typeof( Bloodmoss ),4 ); + Add( typeof( MandrakeRoot ), 2 ); + Add( typeof( Garlic ), 2 ); + Add( typeof( Ginseng ), 2 ); + Add( typeof( Nightshade ), 2 ); + Add( typeof( SpidersSilk ), 2 ); + Add( typeof( SulfurousAsh ), 2 ); if ( Core.AOS ) { @@ -132,4 +132,4 @@ namespace Server.Mobiles } } } -} \ No newline at end of file +} diff --git a/Scripts/Mobiles/Vendors/SBInfo/SBMapmaker.cs b/Scripts/Mobiles/Vendors/SBInfo/SBMapmaker.cs index 2d343f0c9..560c6d49f 100644 --- a/Scripts/Mobiles/Vendors/SBInfo/SBMapmaker.cs +++ b/Scripts/Mobiles/Vendors/SBInfo/SBMapmaker.cs @@ -13,8 +13,8 @@ namespace Server.Mobiles { } - public override IShopSellInfo SellInfo { get { return m_SellInfo; } } - public override List BuyInfo { get { return m_BuyInfo; } } + public override IShopSellInfo SellInfo => m_SellInfo; + public override List BuyInfo => m_BuyInfo; public class InternalBuyInfo : List { @@ -44,4 +44,4 @@ namespace Server.Mobiles } } } -} \ No newline at end of file +} diff --git a/Scripts/Mobiles/Vendors/SBInfo/SBMiller.cs b/Scripts/Mobiles/Vendors/SBInfo/SBMiller.cs index 2a1376d47..fae41cfb7 100644 --- a/Scripts/Mobiles/Vendors/SBInfo/SBMiller.cs +++ b/Scripts/Mobiles/Vendors/SBInfo/SBMiller.cs @@ -1,37 +1,37 @@ -using System; -using System.Collections.Generic; -using Server.Items; +using System; +using System.Collections.Generic; +using Server.Items; -namespace Server.Mobiles -{ - public class SBMiller : SBInfo - { - private List m_BuyInfo = new InternalBuyInfo(); - private IShopSellInfo m_SellInfo = new InternalSellInfo(); +namespace Server.Mobiles +{ + public class SBMiller : SBInfo + { + private List m_BuyInfo = new InternalBuyInfo(); + private IShopSellInfo m_SellInfo = new InternalSellInfo(); - public SBMiller() - { - } + public SBMiller() + { + } - public override IShopSellInfo SellInfo { get { return m_SellInfo; } } - public override List BuyInfo { get { return m_BuyInfo; } } + public override IShopSellInfo SellInfo => m_SellInfo; + public override List BuyInfo => m_BuyInfo; - public class InternalBuyInfo : List - { - public InternalBuyInfo() - { + public class InternalBuyInfo : List + { + public InternalBuyInfo() + { Add( new GenericBuyInfo( typeof( SackFlour ), 3, 20, 0x1039, 0 ) ); Add( new GenericBuyInfo( typeof( SheafOfHay ), 2, 20, 0xF36, 0 ) ); - } - } + } + } - public class InternalSellInfo : GenericSellInfo - { - public InternalSellInfo() - { + public class InternalSellInfo : GenericSellInfo + { + public InternalSellInfo() + { Add( typeof( SackFlour ), 1 ); Add( typeof( SheafOfHay ), 1 ); - } - } - } -} \ No newline at end of file + } + } + } +} diff --git a/Scripts/Mobiles/Vendors/SBInfo/SBMiner.cs b/Scripts/Mobiles/Vendors/SBInfo/SBMiner.cs index 2f9c47051..566d08a93 100644 --- a/Scripts/Mobiles/Vendors/SBInfo/SBMiner.cs +++ b/Scripts/Mobiles/Vendors/SBInfo/SBMiner.cs @@ -13,8 +13,8 @@ namespace Server.Mobiles { } - public override IShopSellInfo SellInfo { get { return m_SellInfo; } } - public override List BuyInfo { get { return m_BuyInfo; } } + public override IShopSellInfo SellInfo => m_SellInfo; + public override List BuyInfo => m_BuyInfo; public class InternalBuyInfo : List { @@ -44,4 +44,4 @@ namespace Server.Mobiles } } } -} \ No newline at end of file +} diff --git a/Scripts/Mobiles/Vendors/SBInfo/SBMonk.cs b/Scripts/Mobiles/Vendors/SBInfo/SBMonk.cs index a6d606eff..09b21057d 100644 --- a/Scripts/Mobiles/Vendors/SBInfo/SBMonk.cs +++ b/Scripts/Mobiles/Vendors/SBInfo/SBMonk.cs @@ -13,8 +13,8 @@ namespace Server.Mobiles { } - public override IShopSellInfo SellInfo { get { return m_SellInfo; } } - public override List BuyInfo { get { return m_BuyInfo; } } + public override IShopSellInfo SellInfo => m_SellInfo; + public override List BuyInfo => m_BuyInfo; public class InternalBuyInfo : List { diff --git a/Scripts/Mobiles/Vendors/SBInfo/SBNinja.cs b/Scripts/Mobiles/Vendors/SBInfo/SBNinja.cs index eba1a2fcd..520207d15 100644 --- a/Scripts/Mobiles/Vendors/SBInfo/SBNinja.cs +++ b/Scripts/Mobiles/Vendors/SBInfo/SBNinja.cs @@ -13,8 +13,8 @@ namespace Server.Mobiles { } - public override IShopSellInfo SellInfo { get { return m_SellInfo; } } - public override List BuyInfo { get { return m_BuyInfo; } } + public override IShopSellInfo SellInfo => m_SellInfo; + public override List BuyInfo => m_BuyInfo; public class InternalBuyInfo : List { diff --git a/Scripts/Mobiles/Vendors/SBInfo/SBPlayerBarkeeper.cs b/Scripts/Mobiles/Vendors/SBInfo/SBPlayerBarkeeper.cs index 4ddb8a9ac..b5d083911 100644 --- a/Scripts/Mobiles/Vendors/SBInfo/SBPlayerBarkeeper.cs +++ b/Scripts/Mobiles/Vendors/SBInfo/SBPlayerBarkeeper.cs @@ -13,8 +13,8 @@ namespace Server.Mobiles { } - public override IShopSellInfo SellInfo { get { return m_SellInfo; } } - public override List BuyInfo { get { return m_BuyInfo; } } + public override IShopSellInfo SellInfo => m_SellInfo; + public override List BuyInfo => m_BuyInfo; public class InternalBuyInfo : List { @@ -46,4 +46,4 @@ namespace Server.Mobiles } } } -} \ No newline at end of file +} diff --git a/Scripts/Mobiles/Vendors/SBInfo/SBProvisioner.cs b/Scripts/Mobiles/Vendors/SBInfo/SBProvisioner.cs index af4a0513a..1bf36d40f 100644 --- a/Scripts/Mobiles/Vendors/SBInfo/SBProvisioner.cs +++ b/Scripts/Mobiles/Vendors/SBInfo/SBProvisioner.cs @@ -14,8 +14,8 @@ namespace Server.Mobiles { } - public override IShopSellInfo SellInfo { get { return m_SellInfo; } } - public override List BuyInfo { get { return m_BuyInfo; } } + public override IShopSellInfo SellInfo => m_SellInfo; + public override List BuyInfo => m_BuyInfo; public class InternalBuyInfo : List { @@ -33,11 +33,11 @@ namespace Server.Mobiles Add( new GenericBuyInfo( typeof( Backpack ), 15, 20, 0x9B2, 0 ) ); Add( new GenericBuyInfo( typeof( Pouch ), 6, 20, 0xE79, 0 ) ); Add( new GenericBuyInfo( typeof( Bag ), 6, 20, 0xE76, 0 ) ); - + Add( new GenericBuyInfo( typeof( Candle ), 6, 20, 0xA28, 0 ) ); Add( new GenericBuyInfo( typeof( Torch ), 8, 20, 0xF6B, 0 ) ); Add( new GenericBuyInfo( typeof( Lantern ), 2, 20, 0xA25, 0 ) ); - + //TODO: Oil Flask @ 8GP Add( new GenericBuyInfo( typeof( Lockpick ), 12, 20, 0x14FC, 0 ) ); diff --git a/Scripts/Mobiles/Vendors/SBInfo/SBRancher.cs b/Scripts/Mobiles/Vendors/SBInfo/SBRancher.cs index 81e29a98d..3a39650f7 100644 --- a/Scripts/Mobiles/Vendors/SBInfo/SBRancher.cs +++ b/Scripts/Mobiles/Vendors/SBInfo/SBRancher.cs @@ -14,8 +14,8 @@ namespace Server.Mobiles { } - public override IShopSellInfo SellInfo { get { return m_SellInfo; } } - public override List BuyInfo { get { return m_BuyInfo; } } + public override IShopSellInfo SellInfo => m_SellInfo; + public override List BuyInfo => m_BuyInfo; public class InternalBuyInfo : List { @@ -32,4 +32,4 @@ namespace Server.Mobiles } } } -} \ No newline at end of file +} diff --git a/Scripts/Mobiles/Vendors/SBInfo/SBRanger.cs b/Scripts/Mobiles/Vendors/SBInfo/SBRanger.cs index c522cb702..99ef60859 100644 --- a/Scripts/Mobiles/Vendors/SBInfo/SBRanger.cs +++ b/Scripts/Mobiles/Vendors/SBInfo/SBRanger.cs @@ -13,8 +13,8 @@ namespace Server.Mobiles { } - public override IShopSellInfo SellInfo { get { return m_SellInfo; } } - public override List BuyInfo { get { return m_BuyInfo; } } + public override IShopSellInfo SellInfo => m_SellInfo; + public override List BuyInfo => m_BuyInfo; public class InternalBuyInfo : List { @@ -35,4 +35,4 @@ namespace Server.Mobiles } } } -} \ No newline at end of file +} diff --git a/Scripts/Mobiles/Vendors/SBInfo/SBRealEstateBroker.cs b/Scripts/Mobiles/Vendors/SBInfo/SBRealEstateBroker.cs index 41949067a..b2041e65c 100644 --- a/Scripts/Mobiles/Vendors/SBInfo/SBRealEstateBroker.cs +++ b/Scripts/Mobiles/Vendors/SBInfo/SBRealEstateBroker.cs @@ -13,8 +13,8 @@ namespace Server.Mobiles { } - public override IShopSellInfo SellInfo { get { return m_SellInfo; } } - public override List BuyInfo { get { return m_BuyInfo; } } + public override IShopSellInfo SellInfo => m_SellInfo; + public override List BuyInfo => m_BuyInfo; public class InternalBuyInfo : List { @@ -34,4 +34,4 @@ namespace Server.Mobiles } } } -} \ No newline at end of file +} diff --git a/Scripts/Mobiles/Vendors/SBInfo/SBSECook.cs b/Scripts/Mobiles/Vendors/SBInfo/SBSECook.cs index 8ac713072..de6e88b4a 100644 --- a/Scripts/Mobiles/Vendors/SBInfo/SBSECook.cs +++ b/Scripts/Mobiles/Vendors/SBInfo/SBSECook.cs @@ -13,8 +13,8 @@ namespace Server.Mobiles { } - public override IShopSellInfo SellInfo { get { return m_SellInfo; } } - public override List BuyInfo { get { return m_BuyInfo; } } + public override IShopSellInfo SellInfo => m_SellInfo; + public override List BuyInfo => m_BuyInfo; public class InternalBuyInfo : List { @@ -50,4 +50,4 @@ namespace Server.Mobiles } } } -} \ No newline at end of file +} diff --git a/Scripts/Mobiles/Vendors/SBInfo/SBSEHats.cs b/Scripts/Mobiles/Vendors/SBInfo/SBSEHats.cs index bb3865ab6..5f4806a8b 100644 --- a/Scripts/Mobiles/Vendors/SBInfo/SBSEHats.cs +++ b/Scripts/Mobiles/Vendors/SBInfo/SBSEHats.cs @@ -13,8 +13,8 @@ namespace Server.Mobiles { } - public override IShopSellInfo SellInfo { get { return m_SellInfo; } } - public override List BuyInfo { get { return m_BuyInfo; } } + public override IShopSellInfo SellInfo => m_SellInfo; + public override List BuyInfo => m_BuyInfo; public class InternalBuyInfo : List { @@ -36,4 +36,4 @@ namespace Server.Mobiles } } } -} \ No newline at end of file +} diff --git a/Scripts/Mobiles/Vendors/SBInfo/SBSamurai.cs b/Scripts/Mobiles/Vendors/SBInfo/SBSamurai.cs index 8dfa2ae7e..e4e752b05 100644 --- a/Scripts/Mobiles/Vendors/SBInfo/SBSamurai.cs +++ b/Scripts/Mobiles/Vendors/SBInfo/SBSamurai.cs @@ -13,8 +13,8 @@ namespace Server.Mobiles { } - public override IShopSellInfo SellInfo { get { return m_SellInfo; } } - public override List BuyInfo { get { return m_BuyInfo; } } + public override IShopSellInfo SellInfo => m_SellInfo; + public override List BuyInfo => m_BuyInfo; public class InternalBuyInfo : List { diff --git a/Scripts/Mobiles/Vendors/SBInfo/SBScribe.cs b/Scripts/Mobiles/Vendors/SBInfo/SBScribe.cs index ebdbf80a0..7cfe133de 100644 --- a/Scripts/Mobiles/Vendors/SBInfo/SBScribe.cs +++ b/Scripts/Mobiles/Vendors/SBInfo/SBScribe.cs @@ -13,8 +13,8 @@ namespace Server.Mobiles { } - public override IShopSellInfo SellInfo { get { return m_SellInfo; } } - public override List BuyInfo { get { return m_BuyInfo; } } + public override IShopSellInfo SellInfo => m_SellInfo; + public override List BuyInfo => m_BuyInfo; public class InternalBuyInfo : List { @@ -42,4 +42,4 @@ namespace Server.Mobiles } } } -} \ No newline at end of file +} diff --git a/Scripts/Mobiles/Vendors/SBInfo/SBShipwright.cs b/Scripts/Mobiles/Vendors/SBInfo/SBShipwright.cs index d796d8c8c..cae5639dd 100644 --- a/Scripts/Mobiles/Vendors/SBInfo/SBShipwright.cs +++ b/Scripts/Mobiles/Vendors/SBInfo/SBShipwright.cs @@ -14,8 +14,8 @@ namespace Server.Mobiles { } - public override IShopSellInfo SellInfo { get { return m_SellInfo; } } - public override List BuyInfo { get { return m_BuyInfo; } } + public override IShopSellInfo SellInfo => m_SellInfo; + public override List BuyInfo => m_BuyInfo; public class InternalBuyInfo : List { @@ -38,4 +38,4 @@ namespace Server.Mobiles } } } -} \ No newline at end of file +} diff --git a/Scripts/Mobiles/Vendors/SBInfo/SBSmithTools.cs b/Scripts/Mobiles/Vendors/SBInfo/SBSmithTools.cs index 94983c3b6..e533e59ae 100644 --- a/Scripts/Mobiles/Vendors/SBInfo/SBSmithTools.cs +++ b/Scripts/Mobiles/Vendors/SBInfo/SBSmithTools.cs @@ -1,38 +1,38 @@ -using System; -using System.Collections.Generic; -using Server.Items; +using System; +using System.Collections.Generic; +using Server.Items; -namespace Server.Mobiles -{ - public class SBSmithTools: SBInfo - { - private List m_BuyInfo = new InternalBuyInfo(); - private IShopSellInfo m_SellInfo = new InternalSellInfo(); +namespace Server.Mobiles +{ + public class SBSmithTools: SBInfo + { + private List m_BuyInfo = new InternalBuyInfo(); + private IShopSellInfo m_SellInfo = new InternalSellInfo(); - public SBSmithTools() - { - } + public SBSmithTools() + { + } - public override IShopSellInfo SellInfo { get { return m_SellInfo; } } - public override List BuyInfo { get { return m_BuyInfo; } } + public override IShopSellInfo SellInfo => m_SellInfo; + public override List BuyInfo => m_BuyInfo; - public class InternalBuyInfo : List - { - public InternalBuyInfo() - { + public class InternalBuyInfo : List + { + public InternalBuyInfo() + { Add( new GenericBuyInfo( typeof( IronIngot ), 5, 16, 0x1BF2, 0 ) ); - Add( new GenericBuyInfo( typeof( Tongs ), 13, 14, 0xFBB, 0 ) ); + Add( new GenericBuyInfo( typeof( Tongs ), 13, 14, 0xFBB, 0 ) ); - } - } + } + } - public class InternalSellInfo : GenericSellInfo - { - public InternalSellInfo() - { - Add( typeof( Tongs ), 7 ); - Add( typeof( IronIngot ), 4 ); - } - } - } -} \ No newline at end of file + public class InternalSellInfo : GenericSellInfo + { + public InternalSellInfo() + { + Add( typeof( Tongs ), 7 ); + Add( typeof( IronIngot ), 4 ); + } + } + } +} diff --git a/Scripts/Mobiles/Vendors/SBInfo/SBStoneCrafter.cs b/Scripts/Mobiles/Vendors/SBInfo/SBStoneCrafter.cs index e75fd36fe..c7d5d56a6 100644 --- a/Scripts/Mobiles/Vendors/SBInfo/SBStoneCrafter.cs +++ b/Scripts/Mobiles/Vendors/SBInfo/SBStoneCrafter.cs @@ -13,8 +13,8 @@ namespace Server.Mobiles { } - public override IShopSellInfo SellInfo { get { return m_SellInfo; } } - public override List BuyInfo { get { return m_BuyInfo; } } + public override IShopSellInfo SellInfo => m_SellInfo; + public override List BuyInfo => m_BuyInfo; public class InternalBuyInfo : List { @@ -53,7 +53,7 @@ namespace Server.Mobiles Add( typeof( MediumCrate ), 6 ); Add( typeof( LargeCrate ), 7 ); Add( typeof( WoodenChest ), 15 ); - + Add( typeof( LargeTable ), 10 ); Add( typeof( Nightstand ), 7 ); Add( typeof( YewWoodTable ), 10 ); @@ -93,4 +93,4 @@ namespace Server.Mobiles } } } -} \ No newline at end of file +} diff --git a/Scripts/Mobiles/Vendors/SBInfo/SBTailor.cs b/Scripts/Mobiles/Vendors/SBInfo/SBTailor.cs index 701f5e173..5974d5685 100644 --- a/Scripts/Mobiles/Vendors/SBInfo/SBTailor.cs +++ b/Scripts/Mobiles/Vendors/SBInfo/SBTailor.cs @@ -13,17 +13,17 @@ namespace Server.Mobiles { } - public override IShopSellInfo SellInfo { get { return m_SellInfo; } } - public override List BuyInfo { get { return m_BuyInfo; } } + public override IShopSellInfo SellInfo => m_SellInfo; + public override List BuyInfo => m_BuyInfo; public class InternalBuyInfo : List { public InternalBuyInfo() { - Add( new GenericBuyInfo( typeof( SewingKit ), 3, 20, 0xF9D, 0 ) ); + Add( new GenericBuyInfo( typeof( SewingKit ), 3, 20, 0xF9D, 0 ) ); Add( new GenericBuyInfo( typeof( Scissors ), 11, 20, 0xF9F, 0 ) ); - Add( new GenericBuyInfo( typeof( DyeTub ), 8, 20, 0xFAB, 0 ) ); - Add( new GenericBuyInfo( typeof( Dyes ), 8, 20, 0xFA9, 0 ) ); + Add( new GenericBuyInfo( typeof( DyeTub ), 8, 20, 0xFAB, 0 ) ); + Add( new GenericBuyInfo( typeof( Dyes ), 8, 20, 0xFA9, 0 ) ); Add( new GenericBuyInfo( typeof( Shirt ), 12, 20, 0x1517, 0 ) ); Add( new GenericBuyInfo( typeof( ShortPants ), 7, 20, 0x152E, 0 ) ); @@ -54,10 +54,10 @@ namespace Server.Mobiles Add( new GenericBuyInfo( typeof( Bandana ), 6, 20, 0x1540, Utility.RandomDyedHue() ) ); Add( new GenericBuyInfo( typeof( SkullCap ), 7, 20, 0x1544, Utility.RandomDyedHue() ) ); - Add( new GenericBuyInfo( typeof( BoltOfCloth ), 100, 20, 0xf95, Utility.RandomDyedHue() ) ); + Add( new GenericBuyInfo( typeof( BoltOfCloth ), 100, 20, 0xf95, Utility.RandomDyedHue() ) ); - Add( new GenericBuyInfo( typeof( Cloth ), 2, 20, 0x1766, Utility.RandomDyedHue() ) ); - Add( new GenericBuyInfo( typeof( UncutCloth ), 2, 20, 0x1767, Utility.RandomDyedHue() ) ); + Add( new GenericBuyInfo( typeof( Cloth ), 2, 20, 0x1766, Utility.RandomDyedHue() ) ); + Add( new GenericBuyInfo( typeof( UncutCloth ), 2, 20, 0x1767, Utility.RandomDyedHue() ) ); Add( new GenericBuyInfo( typeof( Cotton ), 102, 20, 0xDF9, 0 ) ); Add( new GenericBuyInfo( typeof( Wool ), 62, 20, 0xDF8, 0 ) ); diff --git a/Scripts/Mobiles/Vendors/SBInfo/SBTanner.cs b/Scripts/Mobiles/Vendors/SBInfo/SBTanner.cs index 03f14f569..c0b6af566 100644 --- a/Scripts/Mobiles/Vendors/SBInfo/SBTanner.cs +++ b/Scripts/Mobiles/Vendors/SBInfo/SBTanner.cs @@ -13,8 +13,8 @@ namespace Server.Mobiles { } - public override IShopSellInfo SellInfo { get { return m_SellInfo; } } - public override List BuyInfo { get { return m_BuyInfo; } } + public override IShopSellInfo SellInfo => m_SellInfo; + public override List BuyInfo => m_BuyInfo; public class InternalBuyInfo : List { @@ -65,7 +65,7 @@ namespace Server.Mobiles Add( typeof( Leather ), 5 ); Add( typeof( SkinningKnife ), 7 ); - + Add( typeof( LeatherArms ), 18 ); Add( typeof( LeatherChest ), 23 ); Add( typeof( LeatherGloves ), 15 ); @@ -89,4 +89,4 @@ namespace Server.Mobiles } } } -} \ No newline at end of file +} diff --git a/Scripts/Mobiles/Vendors/SBInfo/SBTavernKeeper.cs b/Scripts/Mobiles/Vendors/SBInfo/SBTavernKeeper.cs index f64424d66..8cd78d2d2 100644 --- a/Scripts/Mobiles/Vendors/SBInfo/SBTavernKeeper.cs +++ b/Scripts/Mobiles/Vendors/SBInfo/SBTavernKeeper.cs @@ -13,8 +13,8 @@ namespace Server.Mobiles { } - public override IShopSellInfo SellInfo { get { return m_SellInfo; } } - public override List BuyInfo { get { return m_BuyInfo; } } + public override IShopSellInfo SellInfo => m_SellInfo; + public override List BuyInfo => m_BuyInfo; public class InternalBuyInfo : List { @@ -61,7 +61,7 @@ namespace Server.Mobiles if ( Multis.BaseHouse.NewVendorSystem ) Add( new GenericBuyInfo( "1062332", typeof( VendorRentalContract ), 1252, 20, 0x14F0, 0x672 ) ); - + /*if ( Map == Tokuno ) { Add( new GenericBuyInfo( typeof( Wasabi ), 2, 20, 0x24E8, 0 ) ); @@ -109,4 +109,4 @@ namespace Server.Mobiles } } } -} \ No newline at end of file +} diff --git a/Scripts/Mobiles/Vendors/SBInfo/SBThief.cs b/Scripts/Mobiles/Vendors/SBInfo/SBThief.cs index fc5ddd9e6..220990e86 100644 --- a/Scripts/Mobiles/Vendors/SBInfo/SBThief.cs +++ b/Scripts/Mobiles/Vendors/SBInfo/SBThief.cs @@ -13,8 +13,8 @@ namespace Server.Mobiles { } - public override IShopSellInfo SellInfo { get { return m_SellInfo; } } - public override List BuyInfo { get { return m_BuyInfo; } } + public override IShopSellInfo SellInfo => m_SellInfo; + public override List BuyInfo => m_BuyInfo; public class InternalBuyInfo : List { @@ -47,4 +47,4 @@ namespace Server.Mobiles } } } -} \ No newline at end of file +} diff --git a/Scripts/Mobiles/Vendors/SBInfo/SBTinker.cs b/Scripts/Mobiles/Vendors/SBInfo/SBTinker.cs index 6d395e691..9e530ab65 100644 --- a/Scripts/Mobiles/Vendors/SBInfo/SBTinker.cs +++ b/Scripts/Mobiles/Vendors/SBInfo/SBTinker.cs @@ -1,25 +1,25 @@ -using System; -using System.Collections.Generic; -using Server.Items; +using System; +using System.Collections.Generic; +using Server.Items; -namespace Server.Mobiles -{ - public class SBTinker: SBInfo - { - private List m_BuyInfo = new InternalBuyInfo(); - private IShopSellInfo m_SellInfo = new InternalSellInfo(); +namespace Server.Mobiles +{ + public class SBTinker: SBInfo + { + private List m_BuyInfo = new InternalBuyInfo(); + private IShopSellInfo m_SellInfo = new InternalSellInfo(); - public SBTinker() - { - } + public SBTinker() + { + } - public override IShopSellInfo SellInfo { get { return m_SellInfo; } } - public override List BuyInfo { get { return m_BuyInfo; } } + public override IShopSellInfo SellInfo => m_SellInfo; + public override List BuyInfo => m_BuyInfo; - public class InternalBuyInfo : List - { - public InternalBuyInfo() - { + public class InternalBuyInfo : List + { + public InternalBuyInfo() + { Add( new GenericBuyInfo( typeof( Clock ), 22, 20, 0x104B, 0 ) ); Add( new GenericBuyInfo( typeof( Nails ), 3, 20, 0x102E, 0 ) ); Add( new GenericBuyInfo( typeof( ClockParts ), 3, 20, 0x104F, 0 ) ); @@ -74,13 +74,13 @@ namespace Server.Mobiles Add( new GenericBuyInfo( typeof( Tambourine ), 21, 20, 0x0E9E, 0 ) ); Add( new GenericBuyInfo( typeof( LapHarp ), 21, 20, 0x0EB2, 0 ) ); Add( new GenericBuyInfo( typeof( Lute ), 21, 20, 0x0EB3, 0 ) ); - } - } + } + } - public class InternalSellInfo : GenericSellInfo - { - public InternalSellInfo() - { + public class InternalSellInfo : GenericSellInfo + { + public InternalSellInfo() + { Add( typeof( Drums ), 10 ); Add( typeof( Tambourine ), 10 ); Add( typeof( LapHarp ), 10 ); @@ -124,7 +124,7 @@ namespace Server.Mobiles Add( typeof( Hammer ), 3 ); Add( typeof( SmithHammer ), 11 ); Add( typeof( ButcherKnife ), 6 ); - } - } - } -} \ No newline at end of file + } + } + } +} diff --git a/Scripts/Mobiles/Vendors/SBInfo/SBVagabond.cs b/Scripts/Mobiles/Vendors/SBInfo/SBVagabond.cs index 9cb0d5c20..1d3167ab0 100644 --- a/Scripts/Mobiles/Vendors/SBInfo/SBVagabond.cs +++ b/Scripts/Mobiles/Vendors/SBInfo/SBVagabond.cs @@ -1,9 +1,9 @@ -using System; -using System.Collections.Generic; -using Server.Items; +using System; +using System.Collections.Generic; +using Server.Items; -namespace Server.Mobiles -{ +namespace Server.Mobiles +{ public class SBVagabond : SBInfo { private List m_BuyInfo = new InternalBuyInfo(); @@ -13,8 +13,8 @@ namespace Server.Mobiles { } - public override IShopSellInfo SellInfo { get { return m_SellInfo; } } - public override List BuyInfo { get { return m_BuyInfo; } } + public override IShopSellInfo SellInfo => m_SellInfo; + public override List BuyInfo => m_BuyInfo; public class InternalBuyInfo : List { @@ -74,4 +74,4 @@ namespace Server.Mobiles } } } -} \ No newline at end of file +} diff --git a/Scripts/Mobiles/Vendors/SBInfo/SBVarietyDealer.cs b/Scripts/Mobiles/Vendors/SBInfo/SBVarietyDealer.cs index 57bc93301..1db6c5dbd 100644 --- a/Scripts/Mobiles/Vendors/SBInfo/SBVarietyDealer.cs +++ b/Scripts/Mobiles/Vendors/SBInfo/SBVarietyDealer.cs @@ -1,9 +1,9 @@ -using System; -using System.Collections.Generic; -using Server.Items; +using System; +using System.Collections.Generic; +using Server.Items; -namespace Server.Mobiles -{ +namespace Server.Mobiles +{ public class SBVarietyDealer : SBInfo { private List m_BuyInfo = new InternalBuyInfo(); @@ -13,8 +13,8 @@ namespace Server.Mobiles { } - public override IShopSellInfo SellInfo { get { return m_SellInfo; } } - public override List BuyInfo { get { return m_BuyInfo; } } + public override IShopSellInfo SellInfo => m_SellInfo; + public override List BuyInfo => m_BuyInfo; public class InternalBuyInfo : List { @@ -36,14 +36,14 @@ namespace Server.Mobiles Add( new GenericBuyInfo( typeof( Bolt ), 6, Utility.Random( 30, 60 ), 0x1BFB, 0 ) ); Add( new GenericBuyInfo( typeof( Arrow ), 3, Utility.Random( 30, 60 ), 0xF3F, 0 ) ); - Add( new GenericBuyInfo( typeof( BlackPearl ), 5, 999, 0xF7A, 0 ) ); - Add( new GenericBuyInfo( typeof( Bloodmoss ), 5, 999, 0xF7B, 0 ) ); - Add( new GenericBuyInfo( typeof( MandrakeRoot ), 3, 999, 0xF86, 0 ) ); - Add( new GenericBuyInfo( typeof( Garlic ), 3, 999, 0xF84, 0 ) ); - Add( new GenericBuyInfo( typeof( Ginseng ), 3, 999, 0xF85, 0 ) ); - Add( new GenericBuyInfo( typeof( Nightshade ), 3, 999, 0xF88, 0 ) ); - Add( new GenericBuyInfo( typeof( SpidersSilk ), 3, 999, 0xF8D, 0 ) ); - Add( new GenericBuyInfo( typeof( SulfurousAsh ), 3, 999, 0xF8C, 0 ) ); + Add( new GenericBuyInfo( typeof( BlackPearl ), 5, 999, 0xF7A, 0 ) ); + Add( new GenericBuyInfo( typeof( Bloodmoss ), 5, 999, 0xF7B, 0 ) ); + Add( new GenericBuyInfo( typeof( MandrakeRoot ), 3, 999, 0xF86, 0 ) ); + Add( new GenericBuyInfo( typeof( Garlic ), 3, 999, 0xF84, 0 ) ); + Add( new GenericBuyInfo( typeof( Ginseng ), 3, 999, 0xF85, 0 ) ); + Add( new GenericBuyInfo( typeof( Nightshade ), 3, 999, 0xF88, 0 ) ); + Add( new GenericBuyInfo( typeof( SpidersSilk ), 3, 999, 0xF8D, 0 ) ); + Add( new GenericBuyInfo( typeof( SulfurousAsh ), 3, 999, 0xF8C, 0 ) ); Add( new GenericBuyInfo( typeof( BreadLoaf ), 7, 10, 0x103B, 0 ) ); Add( new GenericBuyInfo( typeof( Backpack ), 15, 20, 0x9B2, 0 ) ); @@ -133,4 +133,4 @@ namespace Server.Mobiles } } } -} \ No newline at end of file +} diff --git a/Scripts/Mobiles/Vendors/SBInfo/SBVeterinarian.cs b/Scripts/Mobiles/Vendors/SBInfo/SBVeterinarian.cs index 59e172c0f..aba652c0a 100644 --- a/Scripts/Mobiles/Vendors/SBInfo/SBVeterinarian.cs +++ b/Scripts/Mobiles/Vendors/SBInfo/SBVeterinarian.cs @@ -13,8 +13,8 @@ namespace Server.Mobiles { } - public override IShopSellInfo SellInfo { get { return m_SellInfo; } } - public override List BuyInfo { get { return m_BuyInfo; } } + public override IShopSellInfo SellInfo => m_SellInfo; + public override List BuyInfo => m_BuyInfo; public class InternalBuyInfo : List { @@ -36,4 +36,4 @@ namespace Server.Mobiles } } } -} \ No newline at end of file +} diff --git a/Scripts/Mobiles/Vendors/SBInfo/SBWaiter.cs b/Scripts/Mobiles/Vendors/SBInfo/SBWaiter.cs index cd403a911..b8ba93945 100644 --- a/Scripts/Mobiles/Vendors/SBInfo/SBWaiter.cs +++ b/Scripts/Mobiles/Vendors/SBInfo/SBWaiter.cs @@ -13,8 +13,8 @@ namespace Server.Mobiles { } - public override IShopSellInfo SellInfo { get { return m_SellInfo; } } - public override List BuyInfo { get { return m_BuyInfo; } } + public override IShopSellInfo SellInfo => m_SellInfo; + public override List BuyInfo => m_BuyInfo; public class InternalBuyInfo : List { @@ -60,4 +60,4 @@ namespace Server.Mobiles } } } -} \ No newline at end of file +} diff --git a/Scripts/Mobiles/Vendors/SBInfo/SBWeaponSmith.cs b/Scripts/Mobiles/Vendors/SBInfo/SBWeaponSmith.cs index f1916c47e..3e6af4529 100644 --- a/Scripts/Mobiles/Vendors/SBInfo/SBWeaponSmith.cs +++ b/Scripts/Mobiles/Vendors/SBInfo/SBWeaponSmith.cs @@ -1,25 +1,25 @@ -using System; -using System.Collections.Generic; -using Server.Items; +using System; +using System.Collections.Generic; +using Server.Items; -namespace Server.Mobiles -{ - public class SBWeaponSmith: SBInfo - { - private List m_BuyInfo = new InternalBuyInfo(); - private IShopSellInfo m_SellInfo = new InternalSellInfo(); +namespace Server.Mobiles +{ + public class SBWeaponSmith: SBInfo + { + private List m_BuyInfo = new InternalBuyInfo(); + private IShopSellInfo m_SellInfo = new InternalSellInfo(); - public SBWeaponSmith() - { - } + public SBWeaponSmith() + { + } - public override IShopSellInfo SellInfo { get { return m_SellInfo; } } - public override List BuyInfo { get { return m_BuyInfo; } } + public override IShopSellInfo SellInfo => m_SellInfo; + public override List BuyInfo => m_BuyInfo; - public class InternalBuyInfo : List - { - public InternalBuyInfo() - { + public class InternalBuyInfo : List + { + public InternalBuyInfo() + { Add( new GenericBuyInfo( typeof( BlackStaff ), 22, 20, 0xDF1, 0 ) ); Add( new GenericBuyInfo( typeof( Club ), 16, 20, 0x13B4, 0 ) ); Add( new GenericBuyInfo( typeof( GnarledStaff ), 16, 20, 0x13F8, 0 ) ); @@ -43,8 +43,8 @@ namespace Server.Mobiles Add( new GenericBuyInfo( typeof( Hatchet ), 27, 20, 0xF43, 0 ) ); Add( new GenericBuyInfo( typeof( WarFork ), 32, 20, 0x1405, 0 ) ); - switch ( Utility.Random( 3 )) - { + switch ( Utility.Random( 3 )) + { case 0: { Add( new GenericBuyInfo( typeof( ExecutionersAxe ), 30, 20, 0xF45, 0 ) ); @@ -102,14 +102,14 @@ namespace Server.Mobiles } } - - } - } - public class InternalSellInfo : GenericSellInfo - { - public InternalSellInfo() - { + } + } + + public class InternalSellInfo : GenericSellInfo + { + public InternalSellInfo() + { Add( typeof( BattleAxe ), 13 ); Add( typeof( DoubleAxe ), 26 ); Add( typeof( ExecutionersAxe ), 15 ); @@ -136,7 +136,7 @@ namespace Server.Mobiles Add( typeof( HeavyCrossbow ), 27 ); Add( typeof( Bow ), 17 ); - Add( typeof( Crossbow ), 23 ); + Add( typeof( Crossbow ), 23 ); if( Core.AOS ) { @@ -176,7 +176,7 @@ namespace Server.Mobiles Add( typeof( Hatchet ), 13 ); Add( typeof( WarFork ), 16 ); - } - } - } + } + } + } } diff --git a/Scripts/Mobiles/Vendors/SBInfo/SBWeaver.cs b/Scripts/Mobiles/Vendors/SBInfo/SBWeaver.cs index 05602c370..b57bc1da1 100644 --- a/Scripts/Mobiles/Vendors/SBInfo/SBWeaver.cs +++ b/Scripts/Mobiles/Vendors/SBInfo/SBWeaver.cs @@ -1,37 +1,37 @@ -using System; -using System.Collections.Generic; -using Server.Items; +using System; +using System.Collections.Generic; +using Server.Items; -namespace Server.Mobiles -{ - public class SBWeaver: SBInfo - { - private List m_BuyInfo = new InternalBuyInfo(); - private IShopSellInfo m_SellInfo = new InternalSellInfo(); +namespace Server.Mobiles +{ + public class SBWeaver: SBInfo + { + private List m_BuyInfo = new InternalBuyInfo(); + private IShopSellInfo m_SellInfo = new InternalSellInfo(); - public SBWeaver() - { - } + public SBWeaver() + { + } - public override IShopSellInfo SellInfo { get { return m_SellInfo; } } - public override List BuyInfo { get { return m_BuyInfo; } } + public override IShopSellInfo SellInfo => m_SellInfo; + public override List BuyInfo => m_BuyInfo; - public class InternalBuyInfo : List - { - public InternalBuyInfo() - { - Add( new GenericBuyInfo( typeof( Dyes ), 8, 20, 0xFA9, 0 ) ); - Add( new GenericBuyInfo( typeof( DyeTub ), 8, 20, 0xFAB, 0 ) ); + public class InternalBuyInfo : List + { + public InternalBuyInfo() + { + Add( new GenericBuyInfo( typeof( Dyes ), 8, 20, 0xFA9, 0 ) ); + Add( new GenericBuyInfo( typeof( DyeTub ), 8, 20, 0xFAB, 0 ) ); - Add( new GenericBuyInfo( typeof( UncutCloth ), 3, 20, 0x1761, 0 ) ); - Add( new GenericBuyInfo( typeof( UncutCloth ), 3, 20, 0x1762, 0 ) ); - Add( new GenericBuyInfo( typeof( UncutCloth ), 3, 20, 0x1763, 0 ) ); - Add( new GenericBuyInfo( typeof( UncutCloth ), 3, 20, 0x1764, 0 ) ); + Add( new GenericBuyInfo( typeof( UncutCloth ), 3, 20, 0x1761, 0 ) ); + Add( new GenericBuyInfo( typeof( UncutCloth ), 3, 20, 0x1762, 0 ) ); + Add( new GenericBuyInfo( typeof( UncutCloth ), 3, 20, 0x1763, 0 ) ); + Add( new GenericBuyInfo( typeof( UncutCloth ), 3, 20, 0x1764, 0 ) ); - Add( new GenericBuyInfo( typeof( BoltOfCloth ), 100, 20, 0xf9B, 0 ) ); - Add( new GenericBuyInfo( typeof( BoltOfCloth ), 100, 20, 0xf9C, 0 ) ); - Add( new GenericBuyInfo( typeof( BoltOfCloth ), 100, 20, 0xf96, 0 ) ); - Add( new GenericBuyInfo( typeof( BoltOfCloth ), 100, 20, 0xf97, 0 ) ); + Add( new GenericBuyInfo( typeof( BoltOfCloth ), 100, 20, 0xf9B, 0 ) ); + Add( new GenericBuyInfo( typeof( BoltOfCloth ), 100, 20, 0xf9C, 0 ) ); + Add( new GenericBuyInfo( typeof( BoltOfCloth ), 100, 20, 0xf96, 0 ) ); + Add( new GenericBuyInfo( typeof( BoltOfCloth ), 100, 20, 0xf97, 0 ) ); Add( new GenericBuyInfo( typeof( DarkYarn ), 18, 20, 0xE1D, 0 ) ); Add( new GenericBuyInfo( typeof( LightYarn ), 18, 20, 0xE1E, 0 ) ); @@ -39,22 +39,22 @@ namespace Server.Mobiles Add( new GenericBuyInfo( typeof( Scissors ), 11, 20, 0xF9F, 0 ) ); - } - } + } + } - public class InternalSellInfo : GenericSellInfo - { - public InternalSellInfo() - { - Add( typeof( Scissors ), 6 ); - Add( typeof( Dyes ), 4 ); - Add( typeof( DyeTub ), 4 ); + public class InternalSellInfo : GenericSellInfo + { + public InternalSellInfo() + { + Add( typeof( Scissors ), 6 ); + Add( typeof( Dyes ), 4 ); + Add( typeof( DyeTub ), 4 ); Add( typeof( UncutCloth ), 1 ); - Add( typeof( BoltOfCloth ), 50 ); + Add( typeof( BoltOfCloth ), 50 ); Add( typeof( LightYarnUnraveled ), 9 ); Add( typeof( LightYarn ), 9 ); Add( typeof( DarkYarn ), 9 ); - } - } - } -} \ No newline at end of file + } + } + } +} diff --git a/Scripts/Mobiles/Vendors/SBInfo/SE/SBSEArmor.cs b/Scripts/Mobiles/Vendors/SBInfo/SE/SBSEArmor.cs index c09e582ba..1f8492d65 100644 --- a/Scripts/Mobiles/Vendors/SBInfo/SE/SBSEArmor.cs +++ b/Scripts/Mobiles/Vendors/SBInfo/SE/SBSEArmor.cs @@ -13,8 +13,8 @@ namespace Server.Mobiles { } - public override IShopSellInfo SellInfo { get { return m_SellInfo; } } - public override List BuyInfo { get { return m_BuyInfo; } } + public override IShopSellInfo SellInfo => m_SellInfo; + public override List BuyInfo => m_BuyInfo; public class InternalBuyInfo : List { @@ -47,4 +47,4 @@ namespace Server.Mobiles } } } -} \ No newline at end of file +} diff --git a/Scripts/Mobiles/Vendors/SBInfo/SE/SBSEBowyer.cs b/Scripts/Mobiles/Vendors/SBInfo/SE/SBSEBowyer.cs index d8faae89d..1bb7c7287 100644 --- a/Scripts/Mobiles/Vendors/SBInfo/SE/SBSEBowyer.cs +++ b/Scripts/Mobiles/Vendors/SBInfo/SE/SBSEBowyer.cs @@ -13,8 +13,8 @@ namespace Server.Mobiles { } - public override IShopSellInfo SellInfo { get { return m_SellInfo; } } - public override List BuyInfo { get { return m_BuyInfo; } } + public override IShopSellInfo SellInfo => m_SellInfo; + public override List BuyInfo => m_BuyInfo; public class InternalBuyInfo : List { @@ -40,4 +40,4 @@ namespace Server.Mobiles } } } -} \ No newline at end of file +} diff --git a/Scripts/Mobiles/Vendors/SBInfo/SE/SBSECarpenter.cs b/Scripts/Mobiles/Vendors/SBInfo/SE/SBSECarpenter.cs index e8bcc015e..730373f0e 100644 --- a/Scripts/Mobiles/Vendors/SBInfo/SE/SBSECarpenter.cs +++ b/Scripts/Mobiles/Vendors/SBInfo/SE/SBSECarpenter.cs @@ -13,8 +13,8 @@ namespace Server.Mobiles { } - public override IShopSellInfo SellInfo { get { return m_SellInfo; } } - public override List BuyInfo { get { return m_BuyInfo; } } + public override IShopSellInfo SellInfo => m_SellInfo; + public override List BuyInfo => m_BuyInfo; public class InternalBuyInfo : List { @@ -39,4 +39,4 @@ namespace Server.Mobiles } } } -} \ No newline at end of file +} diff --git a/Scripts/Mobiles/Vendors/SBInfo/SE/SBSEFood.cs b/Scripts/Mobiles/Vendors/SBInfo/SE/SBSEFood.cs index 1b4605afb..540114212 100644 --- a/Scripts/Mobiles/Vendors/SBInfo/SE/SBSEFood.cs +++ b/Scripts/Mobiles/Vendors/SBInfo/SE/SBSEFood.cs @@ -13,8 +13,8 @@ namespace Server.Mobiles { } - public override IShopSellInfo SellInfo { get { return m_SellInfo; } } - public override List BuyInfo { get { return m_BuyInfo; } } + public override IShopSellInfo SellInfo => m_SellInfo; + public override List BuyInfo => m_BuyInfo; public class InternalBuyInfo : List { @@ -38,4 +38,4 @@ namespace Server.Mobiles } } } -} \ No newline at end of file +} diff --git a/Scripts/Mobiles/Vendors/SBInfo/SE/SBSELeatherArmor.cs b/Scripts/Mobiles/Vendors/SBInfo/SE/SBSELeatherArmor.cs index 276831a39..2399322d9 100644 --- a/Scripts/Mobiles/Vendors/SBInfo/SE/SBSELeatherArmor.cs +++ b/Scripts/Mobiles/Vendors/SBInfo/SE/SBSELeatherArmor.cs @@ -13,8 +13,8 @@ namespace Server.Mobiles { } - public override IShopSellInfo SellInfo { get { return m_SellInfo; } } - public override List BuyInfo { get { return m_BuyInfo; } } + public override IShopSellInfo SellInfo => m_SellInfo; + public override List BuyInfo => m_BuyInfo; public class InternalBuyInfo : List { @@ -55,4 +55,4 @@ namespace Server.Mobiles } } } -} \ No newline at end of file +} diff --git a/Scripts/Mobiles/Vendors/SBInfo/SE/SBSEWeapons.cs b/Scripts/Mobiles/Vendors/SBInfo/SE/SBSEWeapons.cs index 7673f0f29..8610eb1fb 100644 --- a/Scripts/Mobiles/Vendors/SBInfo/SE/SBSEWeapons.cs +++ b/Scripts/Mobiles/Vendors/SBInfo/SE/SBSEWeapons.cs @@ -13,8 +13,8 @@ namespace Server.Mobiles { } - public override IShopSellInfo SellInfo { get { return m_SellInfo; } } - public override List BuyInfo { get { return m_BuyInfo; } } + public override IShopSellInfo SellInfo => m_SellInfo; + public override List BuyInfo => m_BuyInfo; public class InternalBuyInfo : List { @@ -29,7 +29,7 @@ namespace Server.Mobiles Add( new GenericBuyInfo( typeof( Tekagi ), 55, 20, 0x27AB, 0 ) ); Add( new GenericBuyInfo( typeof( Shuriken ), 18, 20, 0x27AC, 0 ) ); Add( new GenericBuyInfo( typeof( Kama ), 61, 20, 0x27AD, 0 ) ); - Add( new GenericBuyInfo( typeof( Sai ), 56, 20, 0x27AF, 0 ) ); + Add( new GenericBuyInfo( typeof( Sai ), 56, 20, 0x27AF, 0 ) ); } } @@ -51,4 +51,4 @@ namespace Server.Mobiles } } } -} \ No newline at end of file +} diff --git a/Scripts/Mobiles/Vendors/SBInfo/Weapons/SBAxeWeapon.cs b/Scripts/Mobiles/Vendors/SBInfo/Weapons/SBAxeWeapon.cs index 99e9e2bad..504ef61fb 100644 --- a/Scripts/Mobiles/Vendors/SBInfo/Weapons/SBAxeWeapon.cs +++ b/Scripts/Mobiles/Vendors/SBInfo/Weapons/SBAxeWeapon.cs @@ -13,8 +13,8 @@ namespace Server.Mobiles { } - public override IShopSellInfo SellInfo { get { return m_SellInfo; } } - public override List BuyInfo { get { return m_BuyInfo; } } + public override IShopSellInfo SellInfo => m_SellInfo; + public override List BuyInfo => m_BuyInfo; public class InternalBuyInfo : List { diff --git a/Scripts/Mobiles/Vendors/SBInfo/Weapons/SBKnifeWeapon.cs b/Scripts/Mobiles/Vendors/SBInfo/Weapons/SBKnifeWeapon.cs index 3c9acf588..b4be76061 100644 --- a/Scripts/Mobiles/Vendors/SBInfo/Weapons/SBKnifeWeapon.cs +++ b/Scripts/Mobiles/Vendors/SBInfo/Weapons/SBKnifeWeapon.cs @@ -13,8 +13,8 @@ namespace Server.Mobiles { } - public override IShopSellInfo SellInfo { get { return m_SellInfo; } } - public override List BuyInfo { get { return m_BuyInfo; } } + public override IShopSellInfo SellInfo => m_SellInfo; + public override List BuyInfo => m_BuyInfo; public class InternalBuyInfo : List { diff --git a/Scripts/Mobiles/Vendors/SBInfo/Weapons/SBMaceWeapon.cs b/Scripts/Mobiles/Vendors/SBInfo/Weapons/SBMaceWeapon.cs index b9d633ef2..a26fcd2df 100644 --- a/Scripts/Mobiles/Vendors/SBInfo/Weapons/SBMaceWeapon.cs +++ b/Scripts/Mobiles/Vendors/SBInfo/Weapons/SBMaceWeapon.cs @@ -13,8 +13,8 @@ namespace Server.Mobiles { } - public override IShopSellInfo SellInfo { get { return m_SellInfo; } } - public override List BuyInfo { get { return m_BuyInfo; } } + public override IShopSellInfo SellInfo => m_SellInfo; + public override List BuyInfo => m_BuyInfo; public class InternalBuyInfo : List { diff --git a/Scripts/Mobiles/Vendors/SBInfo/Weapons/SBPoleArmWeapon.cs b/Scripts/Mobiles/Vendors/SBInfo/Weapons/SBPoleArmWeapon.cs index 3a43e4c23..4873cc655 100644 --- a/Scripts/Mobiles/Vendors/SBInfo/Weapons/SBPoleArmWeapon.cs +++ b/Scripts/Mobiles/Vendors/SBInfo/Weapons/SBPoleArmWeapon.cs @@ -13,8 +13,8 @@ namespace Server.Mobiles { } - public override IShopSellInfo SellInfo { get { return m_SellInfo; } } - public override List BuyInfo { get { return m_BuyInfo; } } + public override IShopSellInfo SellInfo => m_SellInfo; + public override List BuyInfo => m_BuyInfo; public class InternalBuyInfo : List { diff --git a/Scripts/Mobiles/Vendors/SBInfo/Weapons/SBRangedWeapon.cs b/Scripts/Mobiles/Vendors/SBInfo/Weapons/SBRangedWeapon.cs index e0d8981e1..14c31aca7 100644 --- a/Scripts/Mobiles/Vendors/SBInfo/Weapons/SBRangedWeapon.cs +++ b/Scripts/Mobiles/Vendors/SBInfo/Weapons/SBRangedWeapon.cs @@ -13,8 +13,8 @@ namespace Server.Mobiles { } - public override IShopSellInfo SellInfo { get { return m_SellInfo; } } - public override List BuyInfo { get { return m_BuyInfo; } } + public override IShopSellInfo SellInfo => m_SellInfo; + public override List BuyInfo => m_BuyInfo; public class InternalBuyInfo : List { @@ -42,7 +42,7 @@ namespace Server.Mobiles Add( typeof( Bolt ), 1 ); Add( typeof( Arrow ), 1 ); Add( typeof( Shaft ), 1 ); - Add( typeof( Feather ), 1 ); + Add( typeof( Feather ), 1 ); Add( typeof( HeavyCrossbow ), 27 ); Add( typeof( Bow ), 17 ); diff --git a/Scripts/Mobiles/Vendors/SBInfo/Weapons/SBSpearForkWeapon.cs b/Scripts/Mobiles/Vendors/SBInfo/Weapons/SBSpearForkWeapon.cs index 11115f741..a78e3607e 100644 --- a/Scripts/Mobiles/Vendors/SBInfo/Weapons/SBSpearForkWeapon.cs +++ b/Scripts/Mobiles/Vendors/SBInfo/Weapons/SBSpearForkWeapon.cs @@ -13,8 +13,8 @@ namespace Server.Mobiles { } - public override IShopSellInfo SellInfo { get { return m_SellInfo; } } - public override List BuyInfo { get { return m_BuyInfo; } } + public override IShopSellInfo SellInfo => m_SellInfo; + public override List BuyInfo => m_BuyInfo; public class InternalBuyInfo : List { diff --git a/Scripts/Mobiles/Vendors/SBInfo/Weapons/SBStavesWeapon.cs b/Scripts/Mobiles/Vendors/SBInfo/Weapons/SBStavesWeapon.cs index c8a93542e..f3acd81b5 100644 --- a/Scripts/Mobiles/Vendors/SBInfo/Weapons/SBStavesWeapon.cs +++ b/Scripts/Mobiles/Vendors/SBInfo/Weapons/SBStavesWeapon.cs @@ -13,8 +13,8 @@ namespace Server.Mobiles { } - public override IShopSellInfo SellInfo { get { return m_SellInfo; } } - public override List BuyInfo { get { return m_BuyInfo; } } + public override IShopSellInfo SellInfo => m_SellInfo; + public override List BuyInfo => m_BuyInfo; public class InternalBuyInfo : List { diff --git a/Scripts/Mobiles/Vendors/SBInfo/Weapons/SBSwordWeapon.cs b/Scripts/Mobiles/Vendors/SBInfo/Weapons/SBSwordWeapon.cs index c6646d37e..aae8ce764 100644 --- a/Scripts/Mobiles/Vendors/SBInfo/Weapons/SBSwordWeapon.cs +++ b/Scripts/Mobiles/Vendors/SBInfo/Weapons/SBSwordWeapon.cs @@ -13,8 +13,8 @@ namespace Server.Mobiles { } - public override IShopSellInfo SellInfo { get { return m_SellInfo; } } - public override List BuyInfo { get { return m_BuyInfo; } } + public override IShopSellInfo SellInfo => m_SellInfo; + public override List BuyInfo => m_BuyInfo; public class InternalBuyInfo : List { diff --git a/Scripts/Multis/BaseHouse.cs b/Scripts/Multis/BaseHouse.cs index 6fa74c8bc..6d1ca8c6e 100644 --- a/Scripts/Multis/BaseHouse.cs +++ b/Scripts/Multis/BaseHouse.cs @@ -989,8 +989,7 @@ namespace Server.Multis if ( m != null ) { - List exists = null; - m_Table.TryGetValue( m, out exists ); + m_Table.TryGetValue( m, out List exists ); if ( exists != null ) { @@ -1246,8 +1245,7 @@ namespace Server.Multis if ( owner != null ) { - List list = null; - m_Table.TryGetValue( owner, out list ); + m_Table.TryGetValue( owner, out List list ); if ( list == null ) m_Table[owner] = list = new List(); @@ -2702,8 +2700,7 @@ namespace Server.Multis if ( m_Owner != null ) { - List list = null; - m_Table.TryGetValue( m_Owner, out list ); + m_Table.TryGetValue( m_Owner, out List list ); if ( list == null ) m_Table[m_Owner] = list = new List(); @@ -2821,8 +2818,7 @@ namespace Server.Multis { if ( m_Owner != null ) { - List list = null; - m_Table.TryGetValue( m_Owner, out list ); + m_Table.TryGetValue( m_Owner, out List list ); if ( list == null ) m_Table[m_Owner] = list = new List(); @@ -2835,8 +2831,7 @@ namespace Server.Multis if ( m_Owner != null ) { - List list = null; - m_Table.TryGetValue( m_Owner, out list ); + m_Table.TryGetValue( m_Owner, out List list ); if ( list == null ) m_Table[m_Owner] = list = new List(); @@ -3085,8 +3080,7 @@ namespace Server.Multis if ( m_Owner != null ) { - List list = null; - m_Table.TryGetValue( m_Owner, out list ); + m_Table.TryGetValue( m_Owner, out List list ); if ( list == null ) m_Table[m_Owner] = list = new List(); @@ -3239,8 +3233,7 @@ namespace Server.Multis if ( m == null ) return false; - List list = null; - m_Table.TryGetValue( m, out list ); + m_Table.TryGetValue( m, out List list ); if ( list == null ) return false; diff --git a/Scripts/Multis/Boats/LargeBoat.cs b/Scripts/Multis/Boats/LargeBoat.cs index 55edc5a8f..47b6dc70e 100644 --- a/Scripts/Multis/Boats/LargeBoat.cs +++ b/Scripts/Multis/Boats/LargeBoat.cs @@ -6,20 +6,20 @@ namespace Server.Multis { public class LargeBoat : BaseBoat { - public override int NorthID{ get{ return 0x10; } } - public override int EastID{ get{ return 0x11; } } - public override int SouthID{ get{ return 0x12; } } - public override int WestID{ get{ return 0x13; } } + public override int NorthID => 0x10; + public override int EastID => 0x11; + public override int SouthID => 0x12; + public override int WestID => 0x13; - public override int HoldDistance{ get{ return 5; } } - public override int TillerManDistance{ get{ return -5; } } + public override int HoldDistance => 5; + public override int TillerManDistance => -5; - public override Point2D StarboardOffset{ get{ return new Point2D( 2, -1 ); } } - public override Point2D PortOffset{ get{ return new Point2D( -2, -1 ); } } + public override Point2D StarboardOffset => new Point2D( 2, -1 ); + public override Point2D PortOffset => new Point2D( -2, -1 ); - public override Point3D MarkOffset{ get{ return new Point3D( 0, 0, 3 ); } } + public override Point3D MarkOffset => new Point3D( 0, 0, 3 ); - public override BaseDockedBoat DockedBoat{ get{ return new LargeDockedBoat( this ); } } + public override BaseDockedBoat DockedBoat => new LargeDockedBoat( this ); [Constructible] public LargeBoat() @@ -47,8 +47,8 @@ namespace Server.Multis public class LargeBoatDeed : BaseBoatDeed { - public override int LabelNumber{ get{ return 1041209; } } // large ship deed - public override BaseBoat Boat{ get{ return new LargeBoat(); } } + public override int LabelNumber => 1041209; // large ship deed + public override BaseBoat Boat => new LargeBoat(); [Constructible] public LargeBoatDeed() : base( 0x10, new Point3D( 0, -1, 0 ) ) @@ -76,7 +76,7 @@ namespace Server.Multis public class LargeDockedBoat : BaseDockedBoat { - public override BaseBoat Boat{ get{ return new LargeBoat(); } } + public override BaseBoat Boat => new LargeBoat(); public LargeDockedBoat( BaseBoat boat ) : base( 0x10, new Point3D( 0, -1, 0 ), boat ) { @@ -100,4 +100,4 @@ namespace Server.Multis writer.Write( (int)0 ); } } -} \ No newline at end of file +} diff --git a/Scripts/Multis/Boats/LargeDragonBoat.cs b/Scripts/Multis/Boats/LargeDragonBoat.cs index e248a7023..1daed1188 100644 --- a/Scripts/Multis/Boats/LargeDragonBoat.cs +++ b/Scripts/Multis/Boats/LargeDragonBoat.cs @@ -6,20 +6,20 @@ namespace Server.Multis { public class LargeDragonBoat : BaseBoat { - public override int NorthID{ get{ return 0x14; } } - public override int EastID{ get{ return 0x15; } } - public override int SouthID{ get{ return 0x16; } } - public override int WestID{ get{ return 0x17; } } + public override int NorthID => 0x14; + public override int EastID => 0x15; + public override int SouthID => 0x16; + public override int WestID => 0x17; - public override int HoldDistance{ get{ return 5; } } - public override int TillerManDistance{ get{ return -5; } } + public override int HoldDistance => 5; + public override int TillerManDistance => -5; - public override Point2D StarboardOffset{ get{ return new Point2D( 2, -1 ); } } - public override Point2D PortOffset{ get{ return new Point2D( -2, -1 ); } } + public override Point2D StarboardOffset => new Point2D( 2, -1 ); + public override Point2D PortOffset => new Point2D( -2, -1 ); - public override Point3D MarkOffset{ get{ return new Point3D( 0, 0, 3 ); } } + public override Point3D MarkOffset => new Point3D( 0, 0, 3 ); - public override BaseDockedBoat DockedBoat{ get{ return new LargeDockedDragonBoat( this ); } } + public override BaseDockedBoat DockedBoat => new LargeDockedDragonBoat( this ); [Constructible] public LargeDragonBoat() @@ -47,8 +47,8 @@ namespace Server.Multis public class LargeDragonBoatDeed : BaseBoatDeed { - public override int LabelNumber{ get{ return 1041210; } }// large dragon ship deed - public override BaseBoat Boat{ get{ return new LargeDragonBoat(); } } + public override int LabelNumber => 1041210;// large dragon ship deed + public override BaseBoat Boat => new LargeDragonBoat(); [Constructible] public LargeDragonBoatDeed() : base( 0x14, new Point3D( 0, -1, 0 ) ) @@ -76,7 +76,7 @@ namespace Server.Multis public class LargeDockedDragonBoat : BaseDockedBoat { - public override BaseBoat Boat{ get{ return new LargeDragonBoat(); } } + public override BaseBoat Boat => new LargeDragonBoat(); public LargeDockedDragonBoat( BaseBoat boat ) : base( 0x14, new Point3D( 0, -1, 0 ), boat ) { @@ -100,4 +100,4 @@ namespace Server.Multis writer.Write( (int)0 ); } } -} \ No newline at end of file +} diff --git a/Scripts/Multis/Boats/MediumBoat.cs b/Scripts/Multis/Boats/MediumBoat.cs index 1e0b3ba37..606548f61 100644 --- a/Scripts/Multis/Boats/MediumBoat.cs +++ b/Scripts/Multis/Boats/MediumBoat.cs @@ -6,20 +6,20 @@ namespace Server.Multis { public class MediumBoat : BaseBoat { - public override int NorthID{ get{ return 0x8; } } - public override int EastID{ get{ return 0x9; } } - public override int SouthID{ get{ return 0xA; } } - public override int WestID{ get{ return 0xB; } } + public override int NorthID => 0x8; + public override int EastID => 0x9; + public override int SouthID => 0xA; + public override int WestID => 0xB; - public override int HoldDistance{ get{ return 4; } } - public override int TillerManDistance{ get{ return -5; } } + public override int HoldDistance => 4; + public override int TillerManDistance => -5; - public override Point2D StarboardOffset{ get{ return new Point2D( 2, 0 ); } } - public override Point2D PortOffset{ get{ return new Point2D( -2, 0 ); } } + public override Point2D StarboardOffset => new Point2D( 2, 0 ); + public override Point2D PortOffset => new Point2D( -2, 0 ); - public override Point3D MarkOffset{ get{ return new Point3D( 0, 1, 3 ); } } + public override Point3D MarkOffset => new Point3D( 0, 1, 3 ); - public override BaseDockedBoat DockedBoat{ get{ return new MediumDockedBoat( this ); } } + public override BaseDockedBoat DockedBoat => new MediumDockedBoat( this ); [Constructible] public MediumBoat() @@ -47,8 +47,8 @@ namespace Server.Multis public class MediumBoatDeed : BaseBoatDeed { - public override int LabelNumber{ get{ return 1041207; } } // medium ship deed - public override BaseBoat Boat{ get{ return new MediumBoat(); } } + public override int LabelNumber => 1041207; // medium ship deed + public override BaseBoat Boat => new MediumBoat(); [Constructible] public MediumBoatDeed() : base( 0x8, Point3D.Zero ) @@ -76,7 +76,7 @@ namespace Server.Multis public class MediumDockedBoat : BaseDockedBoat { - public override BaseBoat Boat{ get{ return new MediumBoat(); } } + public override BaseBoat Boat => new MediumBoat(); public MediumDockedBoat( BaseBoat boat ) : base( 0x8, Point3D.Zero, boat ) { @@ -100,4 +100,4 @@ namespace Server.Multis writer.Write( (int)0 ); } } -} \ No newline at end of file +} diff --git a/Scripts/Multis/Boats/MediumDragonBoat.cs b/Scripts/Multis/Boats/MediumDragonBoat.cs index 0cdf001db..16880307a 100644 --- a/Scripts/Multis/Boats/MediumDragonBoat.cs +++ b/Scripts/Multis/Boats/MediumDragonBoat.cs @@ -6,20 +6,20 @@ namespace Server.Multis { public class MediumDragonBoat : BaseBoat { - public override int NorthID{ get{ return 0xC; } } - public override int EastID{ get{ return 0xD; } } - public override int SouthID{ get{ return 0xE; } } - public override int WestID{ get{ return 0xF; } } + public override int NorthID => 0xC; + public override int EastID => 0xD; + public override int SouthID => 0xE; + public override int WestID => 0xF; - public override int HoldDistance{ get{ return 4; } } - public override int TillerManDistance{ get{ return -5; } } + public override int HoldDistance => 4; + public override int TillerManDistance => -5; - public override Point2D StarboardOffset{ get{ return new Point2D( 2, 0 ); } } - public override Point2D PortOffset{ get{ return new Point2D( -2, 0 ); } } + public override Point2D StarboardOffset => new Point2D( 2, 0 ); + public override Point2D PortOffset => new Point2D( -2, 0 ); - public override Point3D MarkOffset{ get{ return new Point3D( 0, 1, 3 ); } } + public override Point3D MarkOffset => new Point3D( 0, 1, 3 ); - public override BaseDockedBoat DockedBoat{ get{ return new MediumDockedDragonBoat( this ); } } + public override BaseDockedBoat DockedBoat => new MediumDockedDragonBoat( this ); [Constructible] public MediumDragonBoat() @@ -47,8 +47,8 @@ namespace Server.Multis public class MediumDragonBoatDeed : BaseBoatDeed { - public override int LabelNumber{ get{ return 1041208; } } // medium dragon ship deed - public override BaseBoat Boat{ get{ return new MediumDragonBoat(); } } + public override int LabelNumber => 1041208; // medium dragon ship deed + public override BaseBoat Boat => new MediumDragonBoat(); [Constructible] public MediumDragonBoatDeed() : base( 0xC, Point3D.Zero ) @@ -76,7 +76,7 @@ namespace Server.Multis public class MediumDockedDragonBoat : BaseDockedBoat { - public override BaseBoat Boat{ get{ return new MediumDragonBoat(); } } + public override BaseBoat Boat => new MediumDragonBoat(); public MediumDockedDragonBoat( BaseBoat boat ) : base( 0xC, Point3D.Zero, boat ) { @@ -100,4 +100,4 @@ namespace Server.Multis writer.Write( (int)0 ); } } -} \ No newline at end of file +} diff --git a/Scripts/Multis/Boats/SmallBoat.cs b/Scripts/Multis/Boats/SmallBoat.cs index 7dc94e039..3708377a5 100644 --- a/Scripts/Multis/Boats/SmallBoat.cs +++ b/Scripts/Multis/Boats/SmallBoat.cs @@ -6,20 +6,20 @@ namespace Server.Multis { public class SmallBoat : BaseBoat { - public override int NorthID{ get{ return 0x0; } } - public override int EastID{ get{ return 0x1; } } - public override int SouthID{ get{ return 0x2; } } - public override int WestID{ get{ return 0x3; } } + public override int NorthID => 0x0; + public override int EastID => 0x1; + public override int SouthID => 0x2; + public override int WestID => 0x3; - public override int HoldDistance{ get{ return 4; } } - public override int TillerManDistance{ get{ return -4; } } + public override int HoldDistance => 4; + public override int TillerManDistance => -4; - public override Point2D StarboardOffset{ get{ return new Point2D( 2, 0 ); } } - public override Point2D PortOffset{ get{ return new Point2D( -2, 0 ); } } + public override Point2D StarboardOffset => new Point2D( 2, 0 ); + public override Point2D PortOffset => new Point2D( -2, 0 ); - public override Point3D MarkOffset{ get{ return new Point3D( 0, 1, 3 ); } } + public override Point3D MarkOffset => new Point3D( 0, 1, 3 ); - public override BaseDockedBoat DockedBoat{ get{ return new SmallDockedBoat( this ); } } + public override BaseDockedBoat DockedBoat => new SmallDockedBoat( this ); [Constructible] public SmallBoat() @@ -47,8 +47,8 @@ namespace Server.Multis public class SmallBoatDeed : BaseBoatDeed { - public override int LabelNumber{ get{ return 1041205; } } // small ship deed - public override BaseBoat Boat{ get{ return new SmallBoat(); } } + public override int LabelNumber => 1041205; // small ship deed + public override BaseBoat Boat => new SmallBoat(); [Constructible] public SmallBoatDeed() : base( 0x0, Point3D.Zero ) @@ -76,7 +76,7 @@ namespace Server.Multis public class SmallDockedBoat : BaseDockedBoat { - public override BaseBoat Boat{ get{ return new SmallBoat(); } } + public override BaseBoat Boat => new SmallBoat(); public SmallDockedBoat( BaseBoat boat ) : base( 0x0, Point3D.Zero, boat ) { @@ -100,4 +100,4 @@ namespace Server.Multis writer.Write( (int)0 ); } } -} \ No newline at end of file +} diff --git a/Scripts/Multis/Boats/SmallDragonBoat.cs b/Scripts/Multis/Boats/SmallDragonBoat.cs index 03b779fe9..b6399bb53 100644 --- a/Scripts/Multis/Boats/SmallDragonBoat.cs +++ b/Scripts/Multis/Boats/SmallDragonBoat.cs @@ -6,20 +6,20 @@ namespace Server.Multis { public class SmallDragonBoat : BaseBoat { - public override int NorthID{ get{ return 0x4; } } - public override int EastID{ get{ return 0x5; } } - public override int SouthID{ get{ return 0x6; } } - public override int WestID{ get{ return 0x7; } } + public override int NorthID => 0x4; + public override int EastID => 0x5; + public override int SouthID => 0x6; + public override int WestID => 0x7; - public override int HoldDistance{ get{ return 4; } } - public override int TillerManDistance{ get{ return -4; } } + public override int HoldDistance => 4; + public override int TillerManDistance => -4; - public override Point2D StarboardOffset{ get{ return new Point2D( 2, 0 ); } } - public override Point2D PortOffset{ get{ return new Point2D( -2, 0 ); } } + public override Point2D StarboardOffset => new Point2D( 2, 0 ); + public override Point2D PortOffset => new Point2D( -2, 0 ); - public override Point3D MarkOffset{ get{ return new Point3D( 0, 1, 3 ); } } + public override Point3D MarkOffset => new Point3D( 0, 1, 3 ); - public override BaseDockedBoat DockedBoat{ get{ return new SmallDockedDragonBoat( this ); } } + public override BaseDockedBoat DockedBoat => new SmallDockedDragonBoat( this ); [Constructible] public SmallDragonBoat() @@ -47,8 +47,8 @@ namespace Server.Multis public class SmallDragonBoatDeed : BaseBoatDeed { - public override int LabelNumber{ get{ return 1041206; } } // small dragon ship deed - public override BaseBoat Boat{ get{ return new SmallDragonBoat(); } } + public override int LabelNumber => 1041206; // small dragon ship deed + public override BaseBoat Boat => new SmallDragonBoat(); [Constructible] public SmallDragonBoatDeed() : base( 0x4, Point3D.Zero ) @@ -76,7 +76,7 @@ namespace Server.Multis public class SmallDockedDragonBoat : BaseDockedBoat { - public override BaseBoat Boat{ get{ return new SmallDragonBoat(); } } + public override BaseBoat Boat => new SmallDragonBoat(); public SmallDockedDragonBoat( BaseBoat boat ) : base( 0x4, Point3D.Zero, boat ) { @@ -100,4 +100,4 @@ namespace Server.Multis writer.Write( (int)0 ); } } -} \ No newline at end of file +} diff --git a/Scripts/Multis/ComponentVerification.cs b/Scripts/Multis/ComponentVerification.cs index 1face22e6..3d10dcc59 100644 --- a/Scripts/Multis/ComponentVerification.cs +++ b/Scripts/Multis/ComponentVerification.cs @@ -120,7 +120,7 @@ namespace Server.Multis private ColumnInfo[] m_Columns; private DataRecord[] m_Records; - public DataRecord[] Records { get { return m_Records; } } + public DataRecord[] Records => m_Records; public int GetColumnID( string name ) { @@ -200,8 +200,8 @@ namespace Server.Multis private Spreadsheet m_Spreadsheet; private object[] m_Data; - public Spreadsheet Spreadsheet { get { return m_Spreadsheet; } } - public object[] Data { get { return m_Data; } } + public Spreadsheet Spreadsheet => m_Spreadsheet; + public object[] Data => m_Data; public DataRecord( Spreadsheet ss, object[] data ) { @@ -251,4 +251,4 @@ namespace Server.Multis } } } -} \ No newline at end of file +} diff --git a/Scripts/Multis/Deeds.cs b/Scripts/Multis/Deeds.cs index c408e35f2..16e6af5c0 100644 --- a/Scripts/Multis/Deeds.cs +++ b/Scripts/Multis/Deeds.cs @@ -236,8 +236,8 @@ namespace Server.Multis.Deeds return new SmallOldHouse( owner, 0x64 ); } - public override int LabelNumber{ get{ return 1041211; } } - public override Rectangle2D[] Area{ get{ return SmallOldHouse.AreaArray; } } + public override int LabelNumber => 1041211; + public override Rectangle2D[] Area => SmallOldHouse.AreaArray; public override void Serialize( GenericWriter writer ) { @@ -270,8 +270,8 @@ namespace Server.Multis.Deeds return new SmallOldHouse( owner, 0x66 ); } - public override int LabelNumber{ get{ return 1041212; } } - public override Rectangle2D[] Area{ get{ return SmallOldHouse.AreaArray; } } + public override int LabelNumber => 1041212; + public override Rectangle2D[] Area => SmallOldHouse.AreaArray; public override void Serialize( GenericWriter writer ) { @@ -304,8 +304,8 @@ namespace Server.Multis.Deeds return new SmallOldHouse( owner, 0x68 ); } - public override int LabelNumber{ get{ return 1041213; } } - public override Rectangle2D[] Area{ get{ return SmallOldHouse.AreaArray; } } + public override int LabelNumber => 1041213; + public override Rectangle2D[] Area => SmallOldHouse.AreaArray; public override void Serialize( GenericWriter writer ) { @@ -338,8 +338,8 @@ namespace Server.Multis.Deeds return new SmallOldHouse( owner, 0x6A ); } - public override int LabelNumber{ get{ return 1041214; } } - public override Rectangle2D[] Area{ get{ return SmallOldHouse.AreaArray; } } + public override int LabelNumber => 1041214; + public override Rectangle2D[] Area => SmallOldHouse.AreaArray; public override void Serialize( GenericWriter writer ) { @@ -372,8 +372,8 @@ namespace Server.Multis.Deeds return new SmallOldHouse( owner, 0x6C ); } - public override int LabelNumber{ get{ return 1041215; } } - public override Rectangle2D[] Area{ get{ return SmallOldHouse.AreaArray; } } + public override int LabelNumber => 1041215; + public override Rectangle2D[] Area => SmallOldHouse.AreaArray; public override void Serialize( GenericWriter writer ) { @@ -406,8 +406,8 @@ namespace Server.Multis.Deeds return new SmallOldHouse( owner, 0x6E ); } - public override int LabelNumber{ get{ return 1041216; } } - public override Rectangle2D[] Area{ get{ return SmallOldHouse.AreaArray; } } + public override int LabelNumber => 1041216; + public override Rectangle2D[] Area => SmallOldHouse.AreaArray; public override void Serialize( GenericWriter writer ) { @@ -440,8 +440,8 @@ namespace Server.Multis.Deeds return new GuildHouse( owner ); } - public override int LabelNumber{ get{ return 1041219; } } - public override Rectangle2D[] Area{ get{ return GuildHouse.AreaArray; } } + public override int LabelNumber => 1041219; + public override Rectangle2D[] Area => GuildHouse.AreaArray; public override void Serialize( GenericWriter writer ) { @@ -474,8 +474,8 @@ namespace Server.Multis.Deeds return new TwoStoryHouse( owner, 0x76 ); } - public override int LabelNumber{ get{ return 1041220; } } - public override Rectangle2D[] Area{ get{ return TwoStoryHouse.AreaArray; } } + public override int LabelNumber => 1041220; + public override Rectangle2D[] Area => TwoStoryHouse.AreaArray; public override void Serialize( GenericWriter writer ) { @@ -508,8 +508,8 @@ namespace Server.Multis.Deeds return new TwoStoryHouse( owner, 0x78 ); } - public override int LabelNumber{ get{ return 1041221; } } - public override Rectangle2D[] Area{ get{ return TwoStoryHouse.AreaArray; } } + public override int LabelNumber => 1041221; + public override Rectangle2D[] Area => TwoStoryHouse.AreaArray; public override void Serialize( GenericWriter writer ) { @@ -542,8 +542,8 @@ namespace Server.Multis.Deeds return new Tower( owner ); } - public override int LabelNumber{ get{ return 1041222; } } - public override Rectangle2D[] Area{ get{ return Tower.AreaArray; } } + public override int LabelNumber => 1041222; + public override Rectangle2D[] Area => Tower.AreaArray; public override void Serialize( GenericWriter writer ) { @@ -576,8 +576,8 @@ namespace Server.Multis.Deeds return new Keep( owner ); } - public override int LabelNumber{ get{ return 1041223; } } - public override Rectangle2D[] Area{ get{ return Keep.AreaArray; } } + public override int LabelNumber => 1041223; + public override Rectangle2D[] Area => Keep.AreaArray; public override void Serialize( GenericWriter writer ) { @@ -610,8 +610,8 @@ namespace Server.Multis.Deeds return new Castle( owner ); } - public override int LabelNumber{ get{ return 1041224; } } - public override Rectangle2D[] Area{ get{ return Castle.AreaArray; } } + public override int LabelNumber => 1041224; + public override Rectangle2D[] Area => Castle.AreaArray; public override void Serialize( GenericWriter writer ) { @@ -644,8 +644,8 @@ namespace Server.Multis.Deeds return new LargePatioHouse( owner ); } - public override int LabelNumber{ get{ return 1041231; } } - public override Rectangle2D[] Area{ get{ return LargePatioHouse.AreaArray; } } + public override int LabelNumber => 1041231; + public override Rectangle2D[] Area => LargePatioHouse.AreaArray; public override void Serialize( GenericWriter writer ) { @@ -678,8 +678,8 @@ namespace Server.Multis.Deeds return new LargeMarbleHouse( owner ); } - public override int LabelNumber{ get{ return 1041236; } } - public override Rectangle2D[] Area{ get{ return LargeMarbleHouse.AreaArray; } } + public override int LabelNumber => 1041236; + public override Rectangle2D[] Area => LargeMarbleHouse.AreaArray; public override void Serialize( GenericWriter writer ) { @@ -712,8 +712,8 @@ namespace Server.Multis.Deeds return new SmallTower( owner ); } - public override int LabelNumber{ get{ return 1041237; } } - public override Rectangle2D[] Area{ get{ return SmallTower.AreaArray; } } + public override int LabelNumber => 1041237; + public override Rectangle2D[] Area => SmallTower.AreaArray; public override void Serialize( GenericWriter writer ) { @@ -746,8 +746,8 @@ namespace Server.Multis.Deeds return new LogCabin( owner ); } - public override int LabelNumber{ get{ return 1041238; } } - public override Rectangle2D[] Area{ get{ return LogCabin.AreaArray; } } + public override int LabelNumber => 1041238; + public override Rectangle2D[] Area => LogCabin.AreaArray; public override void Serialize( GenericWriter writer ) { @@ -780,8 +780,8 @@ namespace Server.Multis.Deeds return new SandStonePatio( owner ); } - public override int LabelNumber{ get{ return 1041239; } } - public override Rectangle2D[] Area{ get{ return SandStonePatio.AreaArray; } } + public override int LabelNumber => 1041239; + public override Rectangle2D[] Area => SandStonePatio.AreaArray; public override void Serialize( GenericWriter writer ) { @@ -814,8 +814,8 @@ namespace Server.Multis.Deeds return new TwoStoryVilla( owner ); } - public override int LabelNumber{ get{ return 1041240; } } - public override Rectangle2D[] Area{ get{ return TwoStoryVilla.AreaArray; } } + public override int LabelNumber => 1041240; + public override Rectangle2D[] Area => TwoStoryVilla.AreaArray; public override void Serialize( GenericWriter writer ) { @@ -848,8 +848,8 @@ namespace Server.Multis.Deeds return new SmallShop( owner, 0xA0 ); } - public override int LabelNumber{ get{ return 1041241; } } - public override Rectangle2D[] Area{ get{ return SmallShop.AreaArray2; } } + public override int LabelNumber => 1041241; + public override Rectangle2D[] Area => SmallShop.AreaArray2; public override void Serialize( GenericWriter writer ) { @@ -882,8 +882,8 @@ namespace Server.Multis.Deeds return new SmallShop( owner, 0xA2 ); } - public override int LabelNumber{ get{ return 1041242; } } - public override Rectangle2D[] Area{ get{ return SmallShop.AreaArray1; } } + public override int LabelNumber => 1041242; + public override Rectangle2D[] Area => SmallShop.AreaArray1; public override void Serialize( GenericWriter writer ) { @@ -899,4 +899,4 @@ namespace Server.Multis.Deeds int version = reader.ReadInt(); } } -} \ No newline at end of file +} diff --git a/Scripts/Multis/DynamicDecay.cs b/Scripts/Multis/DynamicDecay.cs index 1a470f217..b6463ee30 100644 --- a/Scripts/Multis/DynamicDecay.cs +++ b/Scripts/Multis/DynamicDecay.cs @@ -6,7 +6,7 @@ namespace Server.Multis { public class DynamicDecay { - public static bool Enabled { get { return Core.ML; } } + public static bool Enabled => Core.ML; private static Dictionary m_Stages; diff --git a/Scripts/Multis/HouseFoundation.cs b/Scripts/Multis/HouseFoundation.cs index 90e27fa09..5c39748a3 100644 --- a/Scripts/Multis/HouseFoundation.cs +++ b/Scripts/Multis/HouseFoundation.cs @@ -42,15 +42,15 @@ namespace Server.Multis public FoundationType Type { get { return m_Type; } set { m_Type = value; } } public int LastRevision { get { return m_LastRevision; } set { m_LastRevision = value; } } - public List Fixtures { get { return m_Fixtures; } } - public Item SignHanger { get { return m_SignHanger; } } - public Item Signpost { get { return m_Signpost; } } + public List Fixtures => m_Fixtures; + public Item SignHanger => m_SignHanger; + public Item Signpost => m_Signpost; public int SignpostGraphic { get { return m_SignpostGraphic; } set { m_SignpostGraphic = value; } } public Mobile Customizer { get { return m_Customizer; } set { m_Customizer = value; } } public override bool IsAosRules => true; - public override bool IsActive { get { return Customizer == null; } } + public override bool IsActive => Customizer == null; public virtual int CustomizationCost { get { return (Core.AOS ? 0 : 10000); } } @@ -573,7 +573,7 @@ namespace Server.Multis } } - public override Point3D BaseBanLocation { get { return new Point3D( Components.Min.X, Components.Height - 1 - Components.Center.Y, 0 ); } } + public override Point3D BaseBanLocation => new Point3D( Components.Min.X, Components.Height - 1 - Components.Center.Y, 0 ); public void CheckSignpost() { @@ -715,7 +715,7 @@ namespace Server.Multis private int m_DefaultPrice; - public override int DefaultPrice { get { return m_DefaultPrice; } } + public override int DefaultPrice => m_DefaultPrice; public override void Deserialize( GenericReader reader ) { @@ -1701,9 +1701,9 @@ namespace Server.Multis } } - public HouseFoundation Foundation { get { return m_Foundation; } } - public MultiComponentList Components { get { return m_Components; } } - public MultiTileEntry[] Fixtures { get { return m_Fixtures; } } + public HouseFoundation Foundation => m_Foundation; + public MultiComponentList Components => m_Components; + public MultiTileEntry[] Fixtures => m_Fixtures; public int Revision { get { return m_Revision; } set { m_Revision = value; } } public DesignState( HouseFoundation foundation, MultiComponentList components ) @@ -1982,9 +1982,9 @@ namespace Server.Multis private HouseFoundation m_Foundation; private int m_Level; - public HouseFoundation Foundation { get { return m_Foundation; } } + public HouseFoundation Foundation => m_Foundation; public int Level { get { return m_Level; } set { m_Level = value; } } - public int MaxLevels { get { return m_Foundation.MaxLevels; } } + public int MaxLevels => m_Foundation.MaxLevels; public DesignContext( HouseFoundation foundation ) { @@ -1994,15 +1994,14 @@ namespace Server.Multis private static Dictionary m_Table = new Dictionary(); - public static Dictionary Table { get { return m_Table; } } + public static Dictionary Table => m_Table; public static DesignContext Find( Mobile from ) { if( from == null ) return null; - DesignContext d; - m_Table.TryGetValue( from, out d ); + m_Table.TryGetValue( from, out DesignContext d ); return d; } diff --git a/Scripts/Multis/HousePlacementTool.cs b/Scripts/Multis/HousePlacementTool.cs index 25732eb6b..6c55e116f 100644 --- a/Scripts/Multis/HousePlacementTool.cs +++ b/Scripts/Multis/HousePlacementTool.cs @@ -11,7 +11,7 @@ namespace Server.Items { public class HousePlacementTool : Item { - public override int LabelNumber{ get{ return 1060651; } } // a house placement tool + public override int LabelNumber => 1060651; // a house placement tool [Constructible] public HousePlacementTool() : base( 0x14F6 ) @@ -501,12 +501,12 @@ namespace Server.Items /* You are about to place a new house. * Placing this house will condemn any and all of your other houses that you may have. * All of your houses on all shards will be affected. - * + * * In addition, you will not be able to place another house or have one transferred to you for one (1) real-life week. - * + * * Once you accept these terms, these effects cannot be reversed. * Re-deeding or transferring your new house will not uncondemn your other house(s) nor will the one week timer be removed. - * + * * If you are absolutely certain you wish to proceed, click the button next to OKAY below. * If you do not wish to trade for this house, click CANCEL. */ @@ -791,4 +791,4 @@ namespace Server.Items public static HousePlacementEntry[] ThreeStoryFoundations{ get{ return m_ThreeStoryFoundations; } } } -} \ No newline at end of file +} diff --git a/Scripts/Multis/Houses.cs b/Scripts/Multis/Houses.cs index 68fbac883..a2b246715 100644 --- a/Scripts/Multis/Houses.cs +++ b/Scripts/Multis/Houses.cs @@ -10,12 +10,12 @@ namespace Server.Multis { public static Rectangle2D[] AreaArray = new Rectangle2D[]{ new Rectangle2D(-3,-3,7,7 ), new Rectangle2D( -1, 4, 3, 1 ) }; - public override Rectangle2D[] Area{ get{ return AreaArray; } } - public override Point3D BaseBanLocation{ get{ return new Point3D( 2, 4, 0 ); } } + public override Rectangle2D[] Area => AreaArray; + public override Point3D BaseBanLocation => new Point3D( 2, 4, 0 ); - public override int DefaultPrice{ get{ return 43800; } } + public override int DefaultPrice => 43800; - public override HousePlacementEntry ConvertEntry{ get{ return HousePlacementEntry.TwoStoryFoundations[0]; } } + public override HousePlacementEntry ConvertEntry => HousePlacementEntry.TwoStoryFoundations[0]; public SmallOldHouse( Mobile owner, int id ) : base( id, owner, 425, 3 ) { @@ -30,7 +30,7 @@ namespace Server.Multis { } - public override HouseDeed GetDeed() + public override HouseDeed GetDeed() { switch ( ItemID ) { @@ -38,8 +38,8 @@ namespace Server.Multis case 0x66: return new FieldStoneHouseDeed(); case 0x68: return new SmallBrickHouseDeed(); case 0x6A: return new WoodHouseDeed(); - case 0x6C: return new WoodPlasterHouseDeed(); - case 0x6E: + case 0x6C: return new WoodPlasterHouseDeed(); + case 0x6E: default: return new ThatchedRoofCottageDeed(); } } @@ -61,14 +61,14 @@ namespace Server.Multis { public static Rectangle2D[] AreaArray = new Rectangle2D[]{ new Rectangle2D( -7, -7, 14, 14 ), new Rectangle2D( -2, 7, 4, 1 ) }; - public override int DefaultPrice{ get{ return 144500; } } + public override int DefaultPrice => 144500; - public override HousePlacementEntry ConvertEntry{ get{ return HousePlacementEntry.ThreeStoryFoundations[20]; } } - public override int ConvertOffsetX{ get{ return -1; } } - public override int ConvertOffsetY{ get{ return -1; } } + public override HousePlacementEntry ConvertEntry => HousePlacementEntry.ThreeStoryFoundations[20]; + public override int ConvertOffsetX => -1; + public override int ConvertOffsetY => -1; - public override Rectangle2D[] Area{ get{ return AreaArray; } } - public override Point3D BaseBanLocation{ get{ return new Point3D( 4, 8, 0 ); } } + public override Rectangle2D[] Area => AreaArray; + public override Point3D BaseBanLocation => new Point3D( 4, 8, 0 ); public GuildHouse( Mobile owner ) : base( 0x74, owner, 1100, 8 ) { @@ -105,10 +105,10 @@ namespace Server.Multis { public static Rectangle2D[] AreaArray = new Rectangle2D[]{ new Rectangle2D( -7, 0, 14, 7 ), new Rectangle2D( -7, -7, 9, 7 ), new Rectangle2D( -4, 7, 4, 1 ) }; - public override Rectangle2D[] Area{ get{ return AreaArray; } } - public override Point3D BaseBanLocation{ get{ return new Point3D( 2, 8, 0 ); } } + public override Rectangle2D[] Area => AreaArray; + public override Point3D BaseBanLocation => new Point3D( 2, 8, 0 ); - public override int DefaultPrice{ get{ return 192400; } } + public override int DefaultPrice => 192400; public TwoStoryHouse( Mobile owner, int id ) : base( id, owner, 1370, 10 ) { @@ -126,8 +126,8 @@ namespace Server.Multis { } - public override HouseDeed GetDeed() - { + public override HouseDeed GetDeed() + { switch( ItemID ) { case 0x76: return new TwoStoryWoodPlasterHouseDeed(); @@ -153,13 +153,13 @@ namespace Server.Multis { public static Rectangle2D[] AreaArray = new Rectangle2D[]{ new Rectangle2D( -7, -7, 16, 14 ), new Rectangle2D( -1, 7, 4, 2 ), new Rectangle2D( -11, 0, 4, 7 ), new Rectangle2D( 9, 0, 4, 7 ) }; - public override int DefaultPrice{ get{ return 433200; } } + public override int DefaultPrice => 433200; - public override HousePlacementEntry ConvertEntry{ get{ return HousePlacementEntry.ThreeStoryFoundations[37]; } } - public override int ConvertOffsetY{ get{ return -1; } } + public override HousePlacementEntry ConvertEntry => HousePlacementEntry.ThreeStoryFoundations[37]; + public override int ConvertOffsetY => -1; - public override Rectangle2D[] Area{ get{ return AreaArray; } } - public override Point3D BaseBanLocation{ get{ return new Point3D( 5, 8, 0 ); } } + public override Rectangle2D[] Area => AreaArray; + public override Point3D BaseBanLocation => new Point3D( 5, 8, 0 ); public Tower( Mobile owner ) : base( 0x7A, owner, 2119, 15 ) { @@ -197,17 +197,17 @@ namespace Server.Multis { public static Rectangle2D[] AreaArray = new Rectangle2D[]{ new Rectangle2D( -11, -11, 7, 8 ), new Rectangle2D( -11, 5, 7, 8 ), new Rectangle2D( 6, -11, 7, 8 ), new Rectangle2D( 6, 5, 7, 8 ), new Rectangle2D( -9, -3, 5, 8 ), new Rectangle2D( 6, -3, 5, 8 ), new Rectangle2D( -4, -9, 10, 20 ), new Rectangle2D( -1, 11, 4, 1 ) }; - public override int DefaultPrice{ get{ return 665200; } } + public override int DefaultPrice => 665200; - public override Rectangle2D[] Area{ get{ return AreaArray; } } - public override Point3D BaseBanLocation{ get{ return new Point3D( 5, 13, 0 ); } } + public override Rectangle2D[] Area => AreaArray; + public override Point3D BaseBanLocation => new Point3D( 5, 13, 0 ); public Keep( Mobile owner ) : base( 0x7C, owner, 2625, 18 ) { uint keyValue = CreateKeys( owner ); AddSouthDoors( false, 0, 10, 6, keyValue ); - + SetSign( 5, 12, 16 ); } @@ -234,10 +234,10 @@ namespace Server.Multis { public static Rectangle2D[] AreaArray = new Rectangle2D[]{ new Rectangle2D( -15, -15, 31, 31 ), new Rectangle2D( -1, 16, 4, 1 ) }; - public override int DefaultPrice{ get{ return 1022800; } } + public override int DefaultPrice => 1022800; - public override Rectangle2D[] Area{ get{ return AreaArray; } } - public override Point3D BaseBanLocation{ get{ return new Point3D( 5, 17, 0 ); } } + public override Rectangle2D[] Area => AreaArray; + public override Point3D BaseBanLocation => new Point3D( 5, 17, 0 ); public Castle( Mobile owner ) : base( 0x7E, owner, 4076, 28 ) { @@ -275,20 +275,20 @@ namespace Server.Multis { public static Rectangle2D[] AreaArray = new Rectangle2D[]{ new Rectangle2D( -7, -7, 15, 14 ), new Rectangle2D( -5, 7, 4, 1 ) }; - public override int DefaultPrice{ get{ return 152800; } } + public override int DefaultPrice => 152800; - public override HousePlacementEntry ConvertEntry{ get{ return HousePlacementEntry.ThreeStoryFoundations[29]; } } - public override int ConvertOffsetY{ get{ return -1; } } + public override HousePlacementEntry ConvertEntry => HousePlacementEntry.ThreeStoryFoundations[29]; + public override int ConvertOffsetY => -1; - public override Rectangle2D[] Area { get { return AreaArray; } } - public override Point3D BaseBanLocation { get { return new Point3D( 1, 8, 0 ); } } + public override Rectangle2D[] Area => AreaArray; + public override Point3D BaseBanLocation => new Point3D( 1, 8, 0 ); public LargePatioHouse( Mobile owner ) : base( 0x8C, owner, 1100, 8 ) { uint keyValue = CreateKeys( owner ); AddSouthDoors( -4, 6, 7, keyValue ); - + SetSign( 1, 8, 16 ); AddEastDoor( 1, 4, 7 ); @@ -319,13 +319,13 @@ namespace Server.Multis { public static Rectangle2D[] AreaArray = new Rectangle2D[]{ new Rectangle2D( -7, -7, 15, 14 ), new Rectangle2D( -6, 7, 6, 1 ) }; - public override int DefaultPrice{ get{ return 192000; } } + public override int DefaultPrice => 192000; - public override HousePlacementEntry ConvertEntry{ get{ return HousePlacementEntry.ThreeStoryFoundations[29]; } } - public override int ConvertOffsetY{ get{ return -1; } } + public override HousePlacementEntry ConvertEntry => HousePlacementEntry.ThreeStoryFoundations[29]; + public override int ConvertOffsetY => -1; - public override Rectangle2D[] Area { get { return AreaArray; } } - public override Point3D BaseBanLocation { get { return new Point3D( 1, 8, 0 ); } } + public override Rectangle2D[] Area => AreaArray; + public override Point3D BaseBanLocation => new Point3D( 1, 8, 0 ); public LargeMarbleHouse( Mobile owner ) : base( 0x96, owner, 1370, 10 ) { @@ -359,12 +359,12 @@ namespace Server.Multis { public static Rectangle2D[] AreaArray = new Rectangle2D[]{ new Rectangle2D( -3, -3, 8, 7 ), new Rectangle2D( 2, 4, 3, 1 ) }; - public override int DefaultPrice{ get{ return 88500; } } + public override int DefaultPrice => 88500; - public override HousePlacementEntry ConvertEntry{ get{ return HousePlacementEntry.TwoStoryFoundations[6]; } } + public override HousePlacementEntry ConvertEntry => HousePlacementEntry.TwoStoryFoundations[6]; - public override Rectangle2D[] Area{ get{ return AreaArray; } } - public override Point3D BaseBanLocation{ get{ return new Point3D( 1, 4, 0 ); } } + public override Rectangle2D[] Area => AreaArray; + public override Point3D BaseBanLocation => new Point3D( 1, 4, 0 ); public SmallTower( Mobile owner ) : base( 0x98, owner, 580, 4 ) { @@ -398,19 +398,19 @@ namespace Server.Multis { public static Rectangle2D[] AreaArray = new Rectangle2D[]{ new Rectangle2D( -3, -6, 8, 13 ) }; - public override int DefaultPrice{ get{ return 97800; } } + public override int DefaultPrice => 97800; - public override HousePlacementEntry ConvertEntry{ get{ return HousePlacementEntry.TwoStoryFoundations[12]; } } + public override HousePlacementEntry ConvertEntry => HousePlacementEntry.TwoStoryFoundations[12]; - public override Rectangle2D[] Area { get { return AreaArray; } } - public override Point3D BaseBanLocation { get { return new Point3D( 5, 8, 0 ); } } + public override Rectangle2D[] Area => AreaArray; + public override Point3D BaseBanLocation => new Point3D( 5, 8, 0 ); public LogCabin( Mobile owner ) : base( 0x9A, owner, 1100, 8 ) { uint keyValue = CreateKeys( owner ); AddSouthDoor( 1, 4, 8, keyValue ); - + SetSign( 5, 8, 20 ); AddSouthDoor( 1, 0, 29 ); @@ -439,20 +439,20 @@ namespace Server.Multis { public static Rectangle2D[] AreaArray = new Rectangle2D[]{ new Rectangle2D( -5, -4, 12, 8 ), new Rectangle2D( -2, 4, 3, 1 ) }; - public override int DefaultPrice{ get{ return 90900; } } + public override int DefaultPrice => 90900; - public override HousePlacementEntry ConvertEntry{ get{ return HousePlacementEntry.TwoStoryFoundations[35]; } } - public override int ConvertOffsetY{ get{ return -1; } } + public override HousePlacementEntry ConvertEntry => HousePlacementEntry.TwoStoryFoundations[35]; + public override int ConvertOffsetY => -1; - public override Rectangle2D[] Area { get { return AreaArray; } } - public override Point3D BaseBanLocation { get { return new Point3D( 4, 6, 0 ); } } + public override Rectangle2D[] Area => AreaArray; + public override Point3D BaseBanLocation => new Point3D( 4, 6, 0 ); public SandStonePatio( Mobile owner ) : base( 0x9C, owner, 850, 6 ) { uint keyValue = CreateKeys( owner ); AddSouthDoor( -1, 3, 6, keyValue ); - + SetSign( 4, 6, 24 ); } @@ -479,19 +479,19 @@ namespace Server.Multis { public static Rectangle2D[] AreaArray = new Rectangle2D[]{ new Rectangle2D( -5, -5, 11, 11 ), new Rectangle2D( 2, 6, 4, 1 ) }; - public override int DefaultPrice{ get{ return 136500; } } + public override int DefaultPrice => 136500; - public override HousePlacementEntry ConvertEntry{ get{ return HousePlacementEntry.TwoStoryFoundations[31]; } } + public override HousePlacementEntry ConvertEntry => HousePlacementEntry.TwoStoryFoundations[31]; - public override Rectangle2D[] Area{ get{ return AreaArray; } } - public override Point3D BaseBanLocation{ get{ return new Point3D( 3, 8, 0 ); } } + public override Rectangle2D[] Area => AreaArray; + public override Point3D BaseBanLocation => new Point3D( 3, 8, 0 ); public TwoStoryVilla( Mobile owner ) : base( 0x9E, owner, 1100, 8 ) { uint keyValue = CreateKeys( owner ); AddSouthDoors( 3, 1, 5, keyValue ); - + SetSign( 3, 8, 24 ); AddEastDoor( 1, 0, 25 ); @@ -519,12 +519,12 @@ namespace Server.Multis public class SmallShop : BaseHouse { - public override Rectangle2D[] Area { get { return ( ItemID == 0x40A2 ? AreaArray1 : AreaArray2 ); } } - public override Point3D BaseBanLocation { get { return new Point3D( 3, 4, 0 ); } } + public override Rectangle2D[] Area => ( ItemID == 0x40A2 ? AreaArray1 : AreaArray2 ); + public override Point3D BaseBanLocation => new Point3D( 3, 4, 0 ); - public override int DefaultPrice{ get{ return 63000; } } + public override int DefaultPrice => 63000; - public override HousePlacementEntry ConvertEntry{ get{ return HousePlacementEntry.TwoStoryFoundations[0]; } } + public override HousePlacementEntry ConvertEntry => HousePlacementEntry.TwoStoryFoundations[0]; public static Rectangle2D[] AreaArray1 = new Rectangle2D[]{ new Rectangle2D(-3,-3,7,7), new Rectangle2D( -1, 4, 4, 1 ) }; public static Rectangle2D[] AreaArray2 = new Rectangle2D[]{ new Rectangle2D(-3,-3,7,7), new Rectangle2D( -2, 4, 3, 1 ) }; @@ -544,7 +544,7 @@ namespace Server.Multis AddDoor( door, -2, 0, id == 0xA2 ? 24 : 27 ); //AddSouthDoor( false, -2, 0, 27 - (id == 0xA2 ? 3 : 0), keyValue ); - + SetSign( 3, 4, 7 - (id == 0xA2 ? 2 : 0) ); } @@ -552,11 +552,11 @@ namespace Server.Multis { } - public override HouseDeed GetDeed() - { + public override HouseDeed GetDeed() + { switch ( ItemID ) { - case 0xA0: return new StoneWorkshopDeed(); + case 0xA0: return new StoneWorkshopDeed(); case 0xA2: default: return new MarbleWorkshopDeed(); } diff --git a/Scripts/Multis/MovingCrate.cs b/Scripts/Multis/MovingCrate.cs index 1b5b9b79d..100f7660d 100644 --- a/Scripts/Multis/MovingCrate.cs +++ b/Scripts/Multis/MovingCrate.cs @@ -15,7 +15,7 @@ namespace Server.Multis public static readonly int HorizontalSpacing = 25; public static readonly int VerticalSpacing = 25; - public override int LabelNumber{ get{ return 1061690; } } // Packing Crate + public override int LabelNumber => 1061690; // Packing Crate private BaseHouse m_House; @@ -27,8 +27,8 @@ namespace Server.Multis set{ m_House = value; } } - public override int DefaultMaxItems{ get{ return 0; } } - public override int DefaultMaxWeight{ get{ return 0; } } + public override int DefaultMaxItems => 0; + public override int DefaultMaxWeight => 0; public MovingCrate( BaseHouse house ) : base( 0xE3D ) { @@ -241,7 +241,7 @@ namespace Server.Multis int version = reader.ReadEncodedInt(); m_House = reader.ReadItem() as BaseHouse; - + if( m_House != null ) { m_House.MovingCrate = this; @@ -276,18 +276,18 @@ namespace Server.Multis public class PackingBox : BaseContainer { - public override int LabelNumber{ get{ return 1061690; } } // Packing Crate + public override int LabelNumber => 1061690; // Packing Crate - public override int DefaultGumpID{ get{ return 0x4B; } } - public override int DefaultDropSound{ get{ return 0x42; } } + public override int DefaultGumpID => 0x4B; + public override int DefaultDropSound => 0x42; public override Rectangle2D Bounds { get{ return new Rectangle2D( 16, 51, 168, 73 ); } } - public override int DefaultMaxItems{ get{ return 0; } } - public override int DefaultMaxWeight{ get{ return 0; } } + public override int DefaultMaxItems => 0; + public override int DefaultMaxWeight => 0; public PackingBox() : base( 0x9A8 ) { @@ -336,4 +336,4 @@ namespace Server.Multis MaxItems = -1; // reset to default } } -} \ No newline at end of file +} diff --git a/Scripts/Regions/BaseRegion.cs b/Scripts/Regions/BaseRegion.cs index 3bd6ae406..3c15962bc 100644 --- a/Scripts/Regions/BaseRegion.cs +++ b/Scripts/Regions/BaseRegion.cs @@ -18,12 +18,12 @@ namespace Server.Regions public class BaseRegion : Region { - public virtual bool YoungProtected { get { return true; } } - public virtual bool YoungMayEnter { get { return true; } } - public virtual bool MountsAllowed { get { return true; } } - public virtual bool DeadMayEnter { get { return true; } } - public virtual bool ResurrectionAllowed { get { return true; } } - public virtual bool LogoutAllowed { get { return true; } } + public virtual bool YoungProtected => true; + public virtual bool YoungMayEnter => true; + public virtual bool MountsAllowed => true; + public virtual bool DeadMayEnter => true; + public virtual bool ResurrectionAllowed => true; + public virtual bool LogoutAllowed => true; public static void Configure() { @@ -557,4 +557,4 @@ namespace Server.Regions } } } -} \ No newline at end of file +} diff --git a/Scripts/Regions/GuardedRegion.cs b/Scripts/Regions/GuardedRegion.cs index 863d8e3f4..28a8f00a8 100644 --- a/Scripts/Regions/GuardedRegion.cs +++ b/Scripts/Regions/GuardedRegion.cs @@ -133,7 +133,7 @@ namespace Server.Regions { m_GuardType = DefaultGuardType; } - + public GuardedRegion( XmlElement xml, Map map, Region parent ) : base( xml, map, parent ) { XmlElement el = xml["guards"]; @@ -262,8 +262,7 @@ namespace Server.Regions if ( IsGuardCandidate( m ) ) { - GuardTimer timer = null; - m_GuardCandidates.TryGetValue( m, out timer ); + m_GuardCandidates.TryGetValue( m, out GuardTimer timer ); if ( timer == null ) { @@ -323,8 +322,7 @@ namespace Server.Regions { if ( IsGuardCandidate( m ) && ( ( !AllowReds && m.Kills >= 5 && m.Region.IsPartOf( this ) ) || m_GuardCandidates.ContainsKey( m ) ) ) { - GuardTimer timer = null; - m_GuardCandidates.TryGetValue( m, out timer ); + m_GuardCandidates.TryGetValue( m, out GuardTimer timer ); if ( timer != null ) { diff --git a/Scripts/Regions/Spawning/SpawnDefinition.cs b/Scripts/Regions/Spawning/SpawnDefinition.cs index ca9e0cfe8..abd634bf5 100644 --- a/Scripts/Regions/Spawning/SpawnDefinition.cs +++ b/Scripts/Regions/Spawning/SpawnDefinition.cs @@ -157,7 +157,7 @@ namespace Server.Regions protected bool m_Land; protected bool m_Water; - public override int Height{ get{ return 16; } } + public override int Height => 16; public override bool Land{ get{ EnsureInit(); return m_Land; } } public override bool Water{ get{ EnsureInit(); return m_Water; } } diff --git a/Scripts/Regions/Spawning/SpawnEntry.cs b/Scripts/Regions/Spawning/SpawnEntry.cs index 78f4ad31a..99e79e4a2 100644 --- a/Scripts/Regions/Spawning/SpawnEntry.cs +++ b/Scripts/Regions/Spawning/SpawnEntry.cs @@ -266,7 +266,7 @@ namespace Server.Regions m_SpawnTimer.Stop(); TimeSpan delay = m_NextSpawn - DateTime.UtcNow; - m_SpawnTimer = Timer.DelayCall( delay > TimeSpan.Zero ? delay : TimeSpan.Zero, new TimerCallback( TimerCallback ) ); + m_SpawnTimer = Timer.DelayCall( delay > TimeSpan.Zero ? delay : TimeSpan.Zero, new TimerCallback( TimerCallback ) ); } } @@ -335,9 +335,7 @@ namespace Server.Regions else { string name = args.GetString( 0 ); - //reg = (Region) from.Map.Regions[name]; - - if ( !from.Map.Regions.TryGetValue( name, out reg ) ) + //reg = if (!from.Map.Regions.TryGetValue( name, out (Region) from.Map.Regions[name] )) { from.SendMessage( "Could not find region '{0}'.", name ); return null; @@ -463,4 +461,4 @@ namespace Server.Regions args.Mobile.SendMessage( "Spawners of region '{0}' have stopped.", region ); } } -} \ No newline at end of file +} diff --git a/Scripts/Skills/Inscribe.cs b/Scripts/Skills/Inscribe.cs index 12a392a88..53e93c500 100644 --- a/Scripts/Skills/Inscribe.cs +++ b/Scripts/Skills/Inscribe.cs @@ -37,8 +37,7 @@ namespace Server.SkillHandlers public static Mobile GetUser( BaseBook book ) { - Mobile m = null; - m_UseTable.TryGetValue(book, out m); + m_UseTable.TryGetValue( book, out Mobile m ); return m; } @@ -161,4 +160,4 @@ namespace Server.SkillHandlers } } } -} \ No newline at end of file +} diff --git a/Scripts/Skills/SpiritSpeak.cs b/Scripts/Skills/SpiritSpeak.cs index 3c0573e08..7c0ce29e0 100644 --- a/Scripts/Skills/SpiritSpeak.cs +++ b/Scripts/Skills/SpiritSpeak.cs @@ -84,8 +84,8 @@ namespace Server.SkillHandlers public override bool ClearHandsOnCast => false; - public override double CastDelayFastScalar { get { return 0; } } - public override TimeSpan CastDelayBase { get { return TimeSpan.FromSeconds( 1.0 ); } } + public override double CastDelayFastScalar => 0; + public override TimeSpan CastDelayBase => TimeSpan.FromSeconds( 1.0 ); public override int GetMana() { diff --git a/Scripts/Skills/Stealth.cs b/Scripts/Skills/Stealth.cs index 27342b79a..939c0beef 100644 --- a/Scripts/Skills/Stealth.cs +++ b/Scripts/Skills/Stealth.cs @@ -13,7 +13,7 @@ namespace Server.SkillHandlers public static double HidingRequirement { get { return ( Core.ML ? 30.0 : ( Core.SE ? 50.0 : 80.0 ) ); } } - public static int[,] ArmorTable { get { return m_ArmorTable; } } + public static int[,] ArmorTable => m_ArmorTable; private static int[,] m_ArmorTable = new int[,] { // Gorget Gloves Helmet Arms Legs Chest Shield @@ -110,4 +110,4 @@ namespace Server.SkillHandlers return TimeSpan.FromSeconds( 10.0 ); } } -} \ No newline at end of file +} diff --git a/Scripts/Skills/Tracking.cs b/Scripts/Skills/Tracking.cs index c4e39c7fb..075618c34 100644 --- a/Scripts/Skills/Tracking.cs +++ b/Scripts/Skills/Tracking.cs @@ -52,8 +52,7 @@ namespace Server.SkillHandlers public static double GetStalkingBonus( Mobile tracker, Mobile target ) { - TrackingInfo info = null; - m_Table.TryGetValue( tracker, out info ); + m_Table.TryGetValue( tracker, out TrackingInfo info ); if ( info == null || info.m_Target != target || info.m_Map != target.Map ) return 0.0; @@ -179,7 +178,7 @@ namespace Server.SkillHandlers foreach ( Mobile m in from.GetMobilesInRange( range ) ) { - // Ghosts can no longer be tracked + // Ghosts can no longer be tracked if ( m != from && (!Core.AOS || m.Alive) && (!m.Hidden || m.AccessLevel == AccessLevel.Player || from.AccessLevel > m.AccessLevel) && check( m ) && CheckDifficulty( from, m ) ) list.Add( m ); } @@ -202,7 +201,7 @@ namespace Server.SkillHandlers } } - // Tracking players uses tracking and detect hidden vs. hiding and stealth + // Tracking players uses tracking and detect hidden vs. hiding and stealth private static bool CheckDifficulty( Mobile from, Mobile m ) { if ( !Core.AOS || !m.Player ) @@ -210,7 +209,7 @@ namespace Server.SkillHandlers - int tracking = from.Skills[SkillName.Tracking].Fixed; + int tracking = from.Skills[SkillName.Tracking].Fixed; int detectHidden = from.Skills[SkillName.DetectHidden].Fixed; if( Core.ML && m.Race == Race.Elf ) @@ -220,7 +219,7 @@ namespace Server.SkillHandlers int stealth = m.Skills[SkillName.Stealth].Fixed; int divisor = hiding + stealth; - // Necromancy forms affect tracking difficulty + // Necromancy forms affect tracking difficulty if ( TransformationSpellHelper.UnderTransformation( m, typeof( HorrificBeastSpell ) ) ) divisor -= 200; else if ( TransformationSpellHelper.UnderTransformation( m, typeof( VampiricEmbraceSpell ) ) && divisor < 500 ) @@ -397,4 +396,4 @@ namespace Server.SkillHandlers } } } -} \ No newline at end of file +} diff --git a/Scripts/SpecialSystems/Engines/PreventInaccess.cs b/Scripts/SpecialSystems/Engines/PreventInaccess.cs index 7f9a46cf0..7d4f91003 100644 --- a/Scripts/SpecialSystems/Engines/PreventInaccess.cs +++ b/Scripts/SpecialSystems/Engines/PreventInaccess.cs @@ -80,8 +80,8 @@ namespace Server.Misc private Point3D m_Location; private Map m_Map; - public Point3D Location { get { return m_Location; } } - public Map Map { get { return m_Map; } } + public Point3D Location => m_Location; + public Map Map => m_Map; public LocationInfo( Point3D loc, Map map ) { diff --git a/Scripts/Spells/Base/SpecialMove.cs b/Scripts/Spells/Base/SpecialMove.cs index 41277620b..ce3384eea 100644 --- a/Scripts/Spells/Base/SpecialMove.cs +++ b/Scripts/Spells/Base/SpecialMove.cs @@ -204,7 +204,7 @@ namespace Server.Spells } } - public virtual bool ValidatesDuringHit{ get { return true; } } + public virtual bool ValidatesDuringHit => true; public static SpecialMove GetCurrentMove( Mobile m ) { @@ -217,8 +217,7 @@ namespace Server.Spells return null; } - SpecialMove move = null; - m_Table.TryGetValue( m, out move ); + m_Table.TryGetValue( m, out SpecialMove move ); if ( move != null && move.ValidatesDuringHit && !move.Validate( m ) ) { @@ -271,8 +270,7 @@ namespace Server.Spells public static void ClearCurrentMove( Mobile m ) { - SpecialMove move = null; - m_Table.TryGetValue( m, out move ); + m_Table.TryGetValue( m, out SpecialMove move ); if ( move != null ) { @@ -318,8 +316,7 @@ namespace Server.Spells public static bool GetContext( Mobile m, Type type ) { - SpecialMoveContext context = null; - m_PlayersTable.TryGetValue( m, out context ); + m_PlayersTable.TryGetValue( m, out SpecialMoveContext context ); if ( context == null ) return false; @@ -359,4 +356,4 @@ namespace Server.Spells } } } -} \ No newline at end of file +} diff --git a/Scripts/Spells/Base/Spell.cs b/Scripts/Spells/Base/Spell.cs index 440b49b12..0de32a1bd 100644 --- a/Scripts/Spells/Base/Spell.cs +++ b/Scripts/Spells/Base/Spell.cs @@ -27,7 +27,7 @@ namespace Server.Spells public string Mantra{ get{ return m_Info.Mantra; } } public Type[] Reagents{ get{ return m_Info.Reagents; } } public Item Scroll{ get{ return m_Scroll; } } - public long StartCastTime { get { return m_StartCastTime; } } + public long StartCastTime => m_StartCastTime; private static TimeSpan NextSpellDelay = TimeSpan.FromSeconds( 0.75 ); private static TimeSpan AnimateDelay = TimeSpan.FromSeconds( 1.5 ); @@ -41,9 +41,9 @@ namespace Server.Spells public virtual bool DelayedDamage{ get{ return false; } } - public virtual bool DelayedDamageStacking { get { return true; } } - //In reality, it's ANY delayed Damage spell Post-AoS that can't stack, but, only - //Expo & Magic Arrow have enough delay and a short enough cast time to bring up + public virtual bool DelayedDamageStacking => true; + //In reality, it's ANY delayed Damage spell Post-AoS that can't stack, but, only + //Expo & Magic Arrow have enough delay and a short enough cast time to bring up //the possibility of stacking 'em. Note that a MA & an Explosion will stack, but //of course, two MA's won't. @@ -55,8 +55,7 @@ namespace Server.Spells public void Add( Mobile m, Timer t ) { - Timer oldTimer; - if( m_Contexts.TryGetValue( m, out oldTimer ) ) + if (m_Contexts.TryGetValue( m, out Timer oldTimer )) { oldTimer.Stop(); m_Contexts.Remove( m ); @@ -76,9 +75,7 @@ namespace Server.Spells if( DelayedDamageStacking ) return; //Sanity - DelayedDamageContextWrapper contexts; - - if( !m_ContextTable.TryGetValue( GetType(), out contexts ) ) + if (!m_ContextTable.TryGetValue( GetType(), out DelayedDamageContextWrapper contexts )) { contexts = new DelayedDamageContextWrapper(); m_ContextTable.Add( GetType(), contexts ); @@ -89,9 +86,7 @@ namespace Server.Spells public void RemoveDelayedDamageContext( Mobile m ) { - DelayedDamageContextWrapper contexts; - - if( !m_ContextTable.TryGetValue( GetType(), out contexts ) ) + if (!m_ContextTable.TryGetValue( GetType(), out DelayedDamageContextWrapper contexts )) return; contexts.Remove( m ); @@ -140,7 +135,7 @@ namespace Server.Spells damageBonus += intBonus; int sdiBonus = AosAttributes.GetValue( m_Caster, AosAttribute.SpellDamage ); - // PvP spell damage increase cap of 15% from an item’s magic property + // PvP spell damage increase cap of 15% from an item�s magic property if ( playerVsPlayer && sdiBonus > 15 ) sdiBonus = 15; @@ -667,8 +662,8 @@ namespace Server.Spells public abstract TimeSpan CastDelayBase { get; } - public virtual double CastDelayFastScalar { get { return 1; } } - public virtual double CastDelaySecondsPerTick { get { return 0.25; } } + public virtual double CastDelayFastScalar => 1; + public virtual double CastDelaySecondsPerTick => 0.25; public virtual TimeSpan CastDelayMinimum { get { return TimeSpan.FromSeconds( 0.25 ); } } //public virtual int CastDelayBase{ get{ return 3; } } @@ -681,10 +676,10 @@ namespace Server.Spells if ( m_Scroll is BaseWand ) return Core.ML ? CastDelayBase : TimeSpan.Zero; // TODO: Should FC apply to wands? - // Faster casting cap of 2 (if not using the protection spell) - // Faster casting cap of 0 (if using the protection spell) - // Paladin spells are subject to a faster casting cap of 4 - // Paladins with magery of 70.0 or above are subject to a faster casting cap of 2 + // Faster casting cap of 2 (if not using the protection spell) + // Faster casting cap of 0 (if using the protection spell) + // Paladin spells are subject to a faster casting cap of 4 + // Paladins with magery of 70.0 or above are subject to a faster casting cap of 2 int fcMax = 4; if ( CastSkill == SkillName.Magery || CastSkill == SkillName.Necromancy || ( CastSkill == SkillName.Chivalry && m_Caster.Skills[SkillName.Magery].Value >= 70.0 ) ) @@ -931,4 +926,4 @@ namespace Server.Spells } } } -} \ No newline at end of file +} diff --git a/Scripts/Spells/Base/SpellHelper.cs b/Scripts/Spells/Base/SpellHelper.cs index 13979c984..4c206f165 100644 --- a/Scripts/Spells/Base/SpellHelper.cs +++ b/Scripts/Spells/Base/SpellHelper.cs @@ -75,12 +75,12 @@ namespace Server.Spells { return CheckMulti( p, map, true, 0); } - + public static bool CheckMulti(Point3D p, Map map, bool houses) { return CheckMulti(p, map, houses, 0); } - + public static bool CheckMulti( Point3D p, Map map, bool houses, int housingrange ) { if( map == null || map == Map.Internal ) @@ -182,11 +182,11 @@ namespace Server.Spells if ( m is BaseCreature ) { BaseCreature c = (BaseCreature)m; - + if ( !c.Controlled ) return true; } - + return false; } @@ -1246,9 +1246,7 @@ namespace Server.Spells public static TransformContext GetContext( Mobile m ) { - TransformContext context = null; - - m_Table.TryGetValue( m, out context ); + m_Table.TryGetValue( m, out TransformContext context ); return context; } @@ -1407,10 +1405,10 @@ namespace Server.Spells private Type m_Type; private ITransformationSpell m_Spell; - public Timer Timer { get { return m_Timer; } } - public List Mods { get { return m_Mods; } } - public Type Type { get { return m_Type; } } - public ITransformationSpell Spell { get { return m_Spell; } } + public Timer Timer => m_Timer; + public List Mods => m_Mods; + public Type Type => m_Type; + public ITransformationSpell Spell => m_Spell; public TransformContext( Timer timer, List mods, Type type, ITransformationSpell spell ) { diff --git a/Scripts/Spells/Base/SpellRegistry.cs b/Scripts/Spells/Base/SpellRegistry.cs index 541c43b32..6e1520283 100644 --- a/Scripts/Spells/Base/SpellRegistry.cs +++ b/Scripts/Spells/Base/SpellRegistry.cs @@ -22,7 +22,7 @@ namespace Server.Spells return m_Types; } } - + //What IS this used for anyways. public static int Count { @@ -42,9 +42,9 @@ namespace Server.Spells } private static Dictionary m_IDsFromTypes = new Dictionary( m_Types.Length ); - + private static Dictionary m_SpecialMoves = new Dictionary(); - public static Dictionary SpecialMoves { get { return m_SpecialMoves; } } + public static Dictionary SpecialMoves => m_SpecialMoves; public static int GetRegistryNumber( ISpell s ) { @@ -174,4 +174,4 @@ namespace Server.Spells return null; } } -} \ No newline at end of file +} diff --git a/Scripts/Spells/Bushido/Confidence.cs b/Scripts/Spells/Bushido/Confidence.cs index 48b7e0241..59190693c 100644 --- a/Scripts/Spells/Bushido/Confidence.cs +++ b/Scripts/Spells/Bushido/Confidence.cs @@ -14,10 +14,10 @@ namespace Server.Spells.Bushido 9002 ); - public override TimeSpan CastDelayBase { get { return TimeSpan.FromSeconds( 0.25 ); } } + public override TimeSpan CastDelayBase => TimeSpan.FromSeconds( 0.25 ); - public override double RequiredSkill{ get{ return 25.0; } } - public override int RequiredMana{ get{ return 10; } } + public override double RequiredSkill => 25.0; + public override int RequiredMana => 10; public Confidence( Mobile caster, Item scroll ) : base( caster, scroll, m_Info ) { @@ -156,4 +156,4 @@ namespace Server.Spells.Bushido } } } -} \ No newline at end of file +} diff --git a/Scripts/Spells/Bushido/CounterAttack.cs b/Scripts/Spells/Bushido/CounterAttack.cs index f0ce431ed..5c6d3797e 100644 --- a/Scripts/Spells/Bushido/CounterAttack.cs +++ b/Scripts/Spells/Bushido/CounterAttack.cs @@ -15,10 +15,10 @@ namespace Server.Spells.Bushido 9002 ); - public override TimeSpan CastDelayBase { get { return TimeSpan.FromSeconds( 0.25 ); } } + public override TimeSpan CastDelayBase => TimeSpan.FromSeconds( 0.25 ); - public override double RequiredSkill{ get{ return 40.0; } } - public override int RequiredMana{ get{ return 5; } } + public override double RequiredSkill => 40.0; + public override int RequiredMana => 5; public override bool CheckCast() { @@ -113,4 +113,4 @@ namespace Server.Spells.Bushido } } } -} \ No newline at end of file +} diff --git a/Scripts/Spells/Bushido/Evasion.cs b/Scripts/Spells/Bushido/Evasion.cs index fa7627d05..2c4490256 100644 --- a/Scripts/Spells/Bushido/Evasion.cs +++ b/Scripts/Spells/Bushido/Evasion.cs @@ -16,10 +16,10 @@ namespace Server.Spells.Bushido 9002 ); - public override TimeSpan CastDelayBase { get { return TimeSpan.FromSeconds( 0.25 ); } } + public override TimeSpan CastDelayBase => TimeSpan.FromSeconds( 0.25 ); - public override double RequiredSkill { get { return 60.0; } } - public override int RequiredMana { get { return 10; } } + public override double RequiredSkill => 60.0; + public override int RequiredMana => 10; public override bool CheckCast() { @@ -74,7 +74,7 @@ namespace Server.Spells.Bushido if ( defender.Spell != null && defender.Spell.IsCasting ) { return false; } - + if ( weap != null ) { if ( defender.Skills[weap.Skill].Base < 50 ) { return false; @@ -83,7 +83,7 @@ namespace Server.Spells.Bushido return false; } } - + if ( IsEvading( defender ) && BaseWeapon.CheckParry( defender ) ) { defender.Emote( "*evades*" ); // Yes. Eew. Blame OSI. defender.FixedEffect( 0x37B9, 10, 16 ); @@ -135,11 +135,11 @@ namespace Server.Spells.Bushido { /* Evasion duration now scales with Bushido skill - * + * * If the player has higher than GM Bushido, and GM Tactics and Anatomy, they get a 1 second bonus * Evasion duration range: * o 3-6 seconds w/o tactics/anatomy - * o 6-7 seconds w/ GM+ Bushido and GM tactics/anatomy + * o 6-7 seconds w/ GM+ Bushido and GM tactics/anatomy */ if( !Core.ML ) @@ -159,9 +159,9 @@ namespace Server.Spells.Bushido public static double GetParryScalar( Mobile m ) { /* Evasion modifier to parry now scales with Bushido skill - * + * * If the player has higher than GM Bushido, and at least GM Tactics and Anatomy, they get a bonus to their evasion modifier (10% bonus to the evasion modifier to parry NOT 10% to the final parry chance) - * + * * Bonus modifier to parry range: (these are the ranges for the evasion modifier) * o 16-40% bonus w/o tactics/anatomy * o 42-50% bonus w/ GM+ bushido and GM tactics/anatomy diff --git a/Scripts/Spells/Bushido/HonorableExecution.cs b/Scripts/Spells/Bushido/HonorableExecution.cs index 09d931079..b7f5caf33 100644 --- a/Scripts/Spells/Bushido/HonorableExecution.cs +++ b/Scripts/Spells/Bushido/HonorableExecution.cs @@ -13,10 +13,10 @@ namespace Server.Spells.Bushido { } - public override int BaseMana{ get{ return 0; } } - public override double RequiredSkill{ get{ return 25.0; } } + public override int BaseMana => 0; + public override double RequiredSkill => 25.0; - public override TextDefinition AbilityMessage{ get{ return new TextDefinition( 1063122 ); } } // You better kill your enemy with your next hit or you'll be rather sorry... + public override TextDefinition AbilityMessage => new TextDefinition( 1063122 ); // You better kill your enemy with your next hit or you'll be rather sorry... public override double GetDamageScalar( Mobile attacker, Mobile defender ) { @@ -186,4 +186,4 @@ namespace Server.Spells.Bushido RemovePenalty( info.m_Mobile ); } } -} \ No newline at end of file +} diff --git a/Scripts/Spells/Bushido/LightningStrike.cs b/Scripts/Spells/Bushido/LightningStrike.cs index 6f4352c23..82498ed82 100644 --- a/Scripts/Spells/Bushido/LightningStrike.cs +++ b/Scripts/Spells/Bushido/LightningStrike.cs @@ -13,10 +13,10 @@ namespace Server.Spells.Bushido { } - public override int BaseMana{ get{ return 5; } } - public override double RequiredSkill{ get{ return 50.0; } } + public override int BaseMana => 5; + public override double RequiredSkill => 50.0; - public override TextDefinition AbilityMessage{ get{ return new TextDefinition( 1063167 ); } } // You prepare to strike quickly. + public override TextDefinition AbilityMessage => new TextDefinition( 1063167 ); // You prepare to strike quickly. public override bool DelayedContext => true; diff --git a/Scripts/Spells/Bushido/MomentumStrike.cs b/Scripts/Spells/Bushido/MomentumStrike.cs index 2b386b7c8..79dc0c620 100644 --- a/Scripts/Spells/Bushido/MomentumStrike.cs +++ b/Scripts/Spells/Bushido/MomentumStrike.cs @@ -13,10 +13,10 @@ namespace Server.Spells.Bushido { } - public override int BaseMana{ get{ return 10; } } - public override double RequiredSkill{ get{ return 70.0; } } + public override int BaseMana => 10; + public override double RequiredSkill => 70.0; - public override TextDefinition AbilityMessage{ get{ return new TextDefinition( 1070757 ); } } // You prepare to strike two enemies with one blow. + public override TextDefinition AbilityMessage => new TextDefinition( 1070757 ); // You prepare to strike two enemies with one blow. public override void OnHit( Mobile attacker, Mobile defender, int damage ) { diff --git a/Scripts/Spells/Bushido/SamuraiMove.cs b/Scripts/Spells/Bushido/SamuraiMove.cs index 69215379f..060b9440d 100644 --- a/Scripts/Spells/Bushido/SamuraiMove.cs +++ b/Scripts/Spells/Bushido/SamuraiMove.cs @@ -5,11 +5,11 @@ namespace Server.Spells { public class SamuraiMove : SpecialMove { - public override SkillName MoveSkill{ get{ return SkillName.Bushido; } } + public override SkillName MoveSkill => SkillName.Bushido; public override void CheckGain( Mobile m ) { m.CheckSkill( MoveSkill, RequiredSkill - 12.5, RequiredSkill + 37.5 ); //Per five on friday 02/16/07 } } -} \ No newline at end of file +} diff --git a/Scripts/Spells/Bushido/SamuraiSpell.cs b/Scripts/Spells/Bushido/SamuraiSpell.cs index e739d0e1a..dd733bcfa 100644 --- a/Scripts/Spells/Bushido/SamuraiSpell.cs +++ b/Scripts/Spells/Bushido/SamuraiSpell.cs @@ -12,17 +12,17 @@ namespace Server.Spells.Bushido public abstract double RequiredSkill{ get; } public abstract int RequiredMana{ get; } - public override SkillName CastSkill{ get{ return SkillName.Bushido; } } - public override SkillName DamageSkill{ get{ return SkillName.Bushido; } } + public override SkillName CastSkill => SkillName.Bushido; + public override SkillName DamageSkill => SkillName.Bushido; public override bool ClearHandsOnCast => false; public override bool BlocksMovement => false; public override bool ShowHandMovement => false; - //public override int CastDelayBase{ get{ return 1; } } - public override double CastDelayFastScalar{ get{ return 0; } } + //public override int CastDelayBase => 1; + public override double CastDelayFastScalar => 0; - public override int CastRecoveryBase{ get{ return 7; } } + public override int CastRecoveryBase => 7; public SamuraiSpell( Mobile caster, Item scroll, SpellInfo info ) : base( caster, scroll, info ) { diff --git a/Scripts/Spells/Chivalry/CleanseByFire.cs b/Scripts/Spells/Chivalry/CleanseByFire.cs index 2d8a4c330..a1b988b5e 100644 --- a/Scripts/Spells/Chivalry/CleanseByFire.cs +++ b/Scripts/Spells/Chivalry/CleanseByFire.cs @@ -14,12 +14,12 @@ namespace Server.Spells.Chivalry 9002 ); - public override TimeSpan CastDelayBase { get { return TimeSpan.FromSeconds( 1.0 ); } } + public override TimeSpan CastDelayBase => TimeSpan.FromSeconds( 1.0 ); - public override double RequiredSkill{ get{ return 5.0; } } - public override int RequiredMana{ get{ return 10; } } - public override int RequiredTithing{ get{ return 10; } } - public override int MantraNumber{ get{ return 1060718; } } // Expor Flamus + public override double RequiredSkill => 5.0; + public override int RequiredMana => 10; + public override int RequiredTithing => 10; + public override int MantraNumber => 1060718; // Expor Flamus public CleanseByFireSpell( Mobile caster, Item scroll ) : base( caster, scroll, m_Info ) { @@ -59,7 +59,7 @@ namespace Server.Spells.Chivalry if ( p != null ) { - // Cleanse by fire is now difficulty based + // Cleanse by fire is now difficulty based int chanceToCure = 10000 + (int)(Caster.Skills[SkillName.Chivalry].Value * 75) - ((p.Level + 1) * 2000); chanceToCure /= 100; @@ -124,4 +124,4 @@ namespace Server.Spells.Chivalry } } } -} \ No newline at end of file +} diff --git a/Scripts/Spells/Chivalry/CloseWounds.cs b/Scripts/Spells/Chivalry/CloseWounds.cs index 253c9e17d..3b50b3c06 100644 --- a/Scripts/Spells/Chivalry/CloseWounds.cs +++ b/Scripts/Spells/Chivalry/CloseWounds.cs @@ -15,12 +15,12 @@ namespace Server.Spells.Chivalry 9002 ); - public override TimeSpan CastDelayBase { get { return TimeSpan.FromSeconds( 1.5 ); } } + public override TimeSpan CastDelayBase => TimeSpan.FromSeconds( 1.5 ); - public override double RequiredSkill{ get{ return 0.0; } } - public override int RequiredMana{ get{ return 10; } } - public override int RequiredTithing{ get{ return 10; } } - public override int MantraNumber{ get{ return 1060719; } } // Obsu Vulni + public override double RequiredSkill => 0.0; + public override int RequiredMana => 10; + public override int RequiredTithing => 10; + public override int MantraNumber => 1060719; // Obsu Vulni public CloseWoundsSpell( Mobile caster, Item scroll ) : base( caster, scroll, m_Info ) { diff --git a/Scripts/Spells/Chivalry/ConsecrateWeapon.cs b/Scripts/Spells/Chivalry/ConsecrateWeapon.cs index 782fb246a..4000060e3 100644 --- a/Scripts/Spells/Chivalry/ConsecrateWeapon.cs +++ b/Scripts/Spells/Chivalry/ConsecrateWeapon.cs @@ -14,12 +14,12 @@ namespace Server.Spells.Chivalry 9002 ); - public override TimeSpan CastDelayBase { get { return TimeSpan.FromSeconds( 0.5 ); } } + public override TimeSpan CastDelayBase => TimeSpan.FromSeconds( 0.5 ); - public override double RequiredSkill{ get{ return 15.0; } } - public override int RequiredMana{ get{ return 10; } } - public override int RequiredTithing{ get{ return 10; } } - public override int MantraNumber{ get{ return 1060720; } } // Consecrus Arma + public override double RequiredSkill => 15.0; + public override int RequiredMana => 10; + public override int RequiredTithing => 10; + public override int MantraNumber => 1060720; // Consecrus Arma public override bool BlocksMovement => false; public ConsecrateWeaponSpell( Mobile caster, Item scroll ) : base( caster, scroll, m_Info ) diff --git a/Scripts/Spells/Chivalry/DispelEvil.cs b/Scripts/Spells/Chivalry/DispelEvil.cs index b7064d079..2e6bc1b4b 100644 --- a/Scripts/Spells/Chivalry/DispelEvil.cs +++ b/Scripts/Spells/Chivalry/DispelEvil.cs @@ -16,12 +16,12 @@ namespace Server.Spells.Chivalry 9002 ); - public override TimeSpan CastDelayBase { get { return TimeSpan.FromSeconds( 0.25 ); } } + public override TimeSpan CastDelayBase => TimeSpan.FromSeconds( 0.25 ); - public override double RequiredSkill{ get{ return 35.0; } } - public override int RequiredMana{ get{ return 10; } } - public override int RequiredTithing{ get{ return 10; } } - public override int MantraNumber{ get{ return 1060721; } } // Dispiro Malas + public override double RequiredSkill => 35.0; + public override int RequiredMana => 10; + public override int RequiredTithing => 10; + public override int MantraNumber => 1060721; // Dispiro Malas public override bool BlocksMovement => false; public DispelEvilSpell( Mobile caster, Item scroll ) : base( caster, scroll, m_Info ) diff --git a/Scripts/Spells/Chivalry/DivineFury.cs b/Scripts/Spells/Chivalry/DivineFury.cs index 77302205e..288a15d10 100644 --- a/Scripts/Spells/Chivalry/DivineFury.cs +++ b/Scripts/Spells/Chivalry/DivineFury.cs @@ -14,12 +14,12 @@ namespace Server.Spells.Chivalry 9002 ); - public override TimeSpan CastDelayBase { get { return TimeSpan.FromSeconds( 1.0 ); } } + public override TimeSpan CastDelayBase => TimeSpan.FromSeconds( 1.0 ); - public override double RequiredSkill{ get{ return 25.0; } } - public override int RequiredMana{ get{ return 15; } } - public override int RequiredTithing{ get{ return 10; } } - public override int MantraNumber{ get{ return 1060722; } } // Divinum Furis + public override double RequiredSkill => 25.0; + public override int RequiredMana => 15; + public override int RequiredTithing => 10; + public override int MantraNumber => 1060722; // Divinum Furis public override bool BlocksMovement => false; public DivineFurySpell( Mobile caster, Item scroll ) : base( caster, scroll, m_Info ) diff --git a/Scripts/Spells/Chivalry/EnemyOfOne.cs b/Scripts/Spells/Chivalry/EnemyOfOne.cs index 7cf55e9e3..3c3b0a890 100644 --- a/Scripts/Spells/Chivalry/EnemyOfOne.cs +++ b/Scripts/Spells/Chivalry/EnemyOfOne.cs @@ -16,12 +16,12 @@ namespace Server.Spells.Chivalry 9002 ); - public override TimeSpan CastDelayBase { get { return TimeSpan.FromSeconds( 0.5 ); } } + public override TimeSpan CastDelayBase => TimeSpan.FromSeconds( 0.5 ); - public override double RequiredSkill{ get{ return 45.0; } } - public override int RequiredMana{ get{ return 20; } } - public override int RequiredTithing{ get{ return 10; } } - public override int MantraNumber{ get{ return 1060723; } } // Forul Solum + public override double RequiredSkill => 45.0; + public override int RequiredMana => 20; + public override int RequiredTithing => 10; + public override int MantraNumber => 1060723; // Forul Solum public override bool BlocksMovement => false; public EnemyOfOneSpell( Mobile caster, Item scroll ) : base( caster, scroll, m_Info ) diff --git a/Scripts/Spells/Chivalry/HolyLight.cs b/Scripts/Spells/Chivalry/HolyLight.cs index 1946bdccf..7cb4bb10f 100644 --- a/Scripts/Spells/Chivalry/HolyLight.cs +++ b/Scripts/Spells/Chivalry/HolyLight.cs @@ -14,12 +14,12 @@ namespace Server.Spells.Chivalry 9002 ); - public override TimeSpan CastDelayBase { get { return TimeSpan.FromSeconds( 1.75 ); } } + public override TimeSpan CastDelayBase => TimeSpan.FromSeconds( 1.75 ); - public override double RequiredSkill{ get{ return 55.0; } } - public override int RequiredMana{ get{ return 10; } } - public override int RequiredTithing{ get{ return 10; } } - public override int MantraNumber{ get{ return 1060724; } } // Augus Luminos + public override double RequiredSkill => 55.0; + public override int RequiredMana => 10; + public override int RequiredTithing => 10; + public override int MantraNumber => 1060724; // Augus Luminos public override bool BlocksMovement => false; public HolyLightSpell( Mobile caster, Item scroll ) : base( caster, scroll, m_Info ) diff --git a/Scripts/Spells/Chivalry/NobleSacrifice.cs b/Scripts/Spells/Chivalry/NobleSacrifice.cs index 5c3842e50..d1c46e601 100644 --- a/Scripts/Spells/Chivalry/NobleSacrifice.cs +++ b/Scripts/Spells/Chivalry/NobleSacrifice.cs @@ -20,12 +20,12 @@ namespace Server.Spells.Chivalry 9002 ); - public override TimeSpan CastDelayBase { get { return TimeSpan.FromSeconds( 1.5 ); } } + public override TimeSpan CastDelayBase => TimeSpan.FromSeconds( 1.5 ); - public override double RequiredSkill{ get{ return 65.0; } } - public override int RequiredMana{ get{ return 20; } } - public override int RequiredTithing{ get{ return 30; } } - public override int MantraNumber{ get{ return 1060725; } } // Dium Prostra + public override double RequiredSkill => 65.0; + public override int RequiredMana => 20; + public override int RequiredTithing => 30; + public override int MantraNumber => 1060725; // Dium Prostra public override bool BlocksMovement => false; public NobleSacrificeSpell( Mobile caster, Item scroll ) : base( caster, scroll, m_Info ) diff --git a/Scripts/Spells/Chivalry/PaladinSpell.cs b/Scripts/Spells/Chivalry/PaladinSpell.cs index ff664eeb8..e7f8be7b0 100644 --- a/Scripts/Spells/Chivalry/PaladinSpell.cs +++ b/Scripts/Spells/Chivalry/PaladinSpell.cs @@ -12,14 +12,14 @@ namespace Server.Spells.Chivalry public abstract int RequiredTithing{ get; } public abstract int MantraNumber{ get; } - public override SkillName CastSkill{ get{ return SkillName.Chivalry; } } - public override SkillName DamageSkill{ get{ return SkillName.Chivalry; } } + public override SkillName CastSkill => SkillName.Chivalry; + public override SkillName DamageSkill => SkillName.Chivalry; public override bool ClearHandsOnCast => false; - //public override int CastDelayBase{ get{ return 1; } } + //public override int CastDelayBase => 1; - public override int CastRecoveryBase{ get{ return 7; } } + public override int CastRecoveryBase => 7; public PaladinSpell( Mobile caster, Item scroll, SpellInfo info ) : base( caster, scroll, info ) { diff --git a/Scripts/Spells/Chivalry/RemoveCurse.cs b/Scripts/Spells/Chivalry/RemoveCurse.cs index dcbd15dfa..fcf87f6f1 100644 --- a/Scripts/Spells/Chivalry/RemoveCurse.cs +++ b/Scripts/Spells/Chivalry/RemoveCurse.cs @@ -16,12 +16,12 @@ namespace Server.Spells.Chivalry 9002 ); - public override TimeSpan CastDelayBase { get { return TimeSpan.FromSeconds( 1.5 ); } } + public override TimeSpan CastDelayBase => TimeSpan.FromSeconds( 1.5 ); - public override double RequiredSkill{ get{ return 5.0; } } - public override int RequiredMana{ get{ return 20; } } - public override int RequiredTithing{ get{ return 10; } } - public override int MantraNumber{ get{ return 1060726; } } // Extermo Vomica + public override double RequiredSkill => 5.0; + public override int RequiredMana => 20; + public override int RequiredTithing => 10; + public override int MantraNumber => 1060726; // Extermo Vomica public RemoveCurseSpell( Mobile caster, Item scroll ) : base( caster, scroll, m_Info ) { @@ -140,4 +140,4 @@ namespace Server.Spells.Chivalry } } } -} \ No newline at end of file +} diff --git a/Scripts/Spells/Chivalry/SacredJourney.cs b/Scripts/Spells/Chivalry/SacredJourney.cs index 642c10f8e..4bcb965ed 100644 --- a/Scripts/Spells/Chivalry/SacredJourney.cs +++ b/Scripts/Spells/Chivalry/SacredJourney.cs @@ -16,12 +16,12 @@ namespace Server.Spells.Chivalry 9002 ); - public override TimeSpan CastDelayBase { get { return TimeSpan.FromSeconds( 1.5 ); } } + public override TimeSpan CastDelayBase => TimeSpan.FromSeconds( 1.5 ); - public override double RequiredSkill{ get{ return 15.0; } } - public override int RequiredMana{ get{ return 10; } } - public override int RequiredTithing{ get{ return 15; } } - public override int MantraNumber{ get{ return 1060727; } } // Sanctum Viatas + public override double RequiredSkill => 15.0; + public override int RequiredMana => 10; + public override int RequiredTithing => 15; + public override int MantraNumber => 1060727; // Sanctum Viatas public override bool BlocksMovement => false; private RunebookEntry m_Entry; diff --git a/Scripts/Spells/Eighth/AirElemental.cs b/Scripts/Spells/Eighth/AirElemental.cs index 97c07f78c..33807363c 100644 --- a/Scripts/Spells/Eighth/AirElemental.cs +++ b/Scripts/Spells/Eighth/AirElemental.cs @@ -17,7 +17,7 @@ namespace Server.Spells.Eighth Reagent.SpidersSilk ); - public override SpellCircle Circle { get { return SpellCircle.Eighth; } } + public override SpellCircle Circle => SpellCircle.Eighth; public AirElementalSpell( Mobile caster, Item scroll ) : base( caster, scroll, m_Info ) { @@ -52,4 +52,4 @@ namespace Server.Spells.Eighth FinishSequence(); } } -} \ No newline at end of file +} diff --git a/Scripts/Spells/Eighth/EarthElemental.cs b/Scripts/Spells/Eighth/EarthElemental.cs index de871a020..749f6640d 100644 --- a/Scripts/Spells/Eighth/EarthElemental.cs +++ b/Scripts/Spells/Eighth/EarthElemental.cs @@ -17,7 +17,7 @@ namespace Server.Spells.Eighth Reagent.SpidersSilk ); - public override SpellCircle Circle { get { return SpellCircle.Eighth; } } + public override SpellCircle Circle => SpellCircle.Eighth; public EarthElementalSpell( Mobile caster, Item scroll ) : base( caster, scroll, m_Info ) { @@ -52,4 +52,4 @@ namespace Server.Spells.Eighth FinishSequence(); } } -} \ No newline at end of file +} diff --git a/Scripts/Spells/Eighth/Earthquake.cs b/Scripts/Spells/Eighth/Earthquake.cs index 7f895009e..dad1660d8 100644 --- a/Scripts/Spells/Eighth/Earthquake.cs +++ b/Scripts/Spells/Eighth/Earthquake.cs @@ -19,7 +19,7 @@ namespace Server.Spells.Eighth Reagent.SulfurousAsh ); - public override SpellCircle Circle { get { return SpellCircle.Eighth; } } + public override SpellCircle Circle => SpellCircle.Eighth; public EarthquakeSpell( Mobile caster, Item scroll ) : base( caster, scroll, m_Info ) { diff --git a/Scripts/Spells/Eighth/EnergyVortex.cs b/Scripts/Spells/Eighth/EnergyVortex.cs index 3c18e5c39..709efec43 100644 --- a/Scripts/Spells/Eighth/EnergyVortex.cs +++ b/Scripts/Spells/Eighth/EnergyVortex.cs @@ -18,7 +18,7 @@ namespace Server.Spells.Eighth Reagent.Nightshade ); - public override SpellCircle Circle { get { return SpellCircle.Eighth; } } + public override SpellCircle Circle => SpellCircle.Eighth; public EnergyVortexSpell( Mobile caster, Item scroll ) : base( caster, scroll, m_Info ) { @@ -98,4 +98,4 @@ namespace Server.Spells.Eighth } } } -} \ No newline at end of file +} diff --git a/Scripts/Spells/Eighth/FireElemental.cs b/Scripts/Spells/Eighth/FireElemental.cs index bfee23191..31cb7f978 100644 --- a/Scripts/Spells/Eighth/FireElemental.cs +++ b/Scripts/Spells/Eighth/FireElemental.cs @@ -18,7 +18,7 @@ namespace Server.Spells.Eighth Reagent.SulfurousAsh ); - public override SpellCircle Circle { get { return SpellCircle.Eighth; } } + public override SpellCircle Circle => SpellCircle.Eighth; public FireElementalSpell( Mobile caster, Item scroll ) : base( caster, scroll, m_Info ) { @@ -53,4 +53,4 @@ namespace Server.Spells.Eighth FinishSequence(); } } -} \ No newline at end of file +} diff --git a/Scripts/Spells/Eighth/Resurrection.cs b/Scripts/Spells/Eighth/Resurrection.cs index b9c1219a8..864fcda34 100644 --- a/Scripts/Spells/Eighth/Resurrection.cs +++ b/Scripts/Spells/Eighth/Resurrection.cs @@ -16,7 +16,7 @@ namespace Server.Spells.Eighth Reagent.Ginseng ); - public override SpellCircle Circle { get { return SpellCircle.Eighth; } } + public override SpellCircle Circle => SpellCircle.Eighth; public ResurrectionSpell( Mobile caster, Item scroll ) : base( caster, scroll, m_Info ) { @@ -110,4 +110,4 @@ namespace Server.Spells.Eighth } } } -} \ No newline at end of file +} diff --git a/Scripts/Spells/Eighth/SummonDaemon.cs b/Scripts/Spells/Eighth/SummonDaemon.cs index 92ebb350f..0871ac962 100644 --- a/Scripts/Spells/Eighth/SummonDaemon.cs +++ b/Scripts/Spells/Eighth/SummonDaemon.cs @@ -20,7 +20,7 @@ namespace Server.Spells.Eighth Reagent.SulfurousAsh ); - public override SpellCircle Circle { get { return SpellCircle.Eighth; } } + public override SpellCircle Circle => SpellCircle.Eighth; public SummonDaemonSpell( Mobile caster, Item scroll ) : base( caster, scroll, m_Info ) { @@ -43,7 +43,7 @@ namespace Server.Spells.Eighth public override void OnCast() { if ( CheckSequence() ) - { + { TimeSpan duration = TimeSpan.FromSeconds( (2 * Caster.Skills.Magery.Fixed) / 5 ); if ( Core.AOS ) /* Why two diff daemons? TODO: solve this */ @@ -59,4 +59,4 @@ namespace Server.Spells.Eighth FinishSequence(); } } -} \ No newline at end of file +} diff --git a/Scripts/Spells/Eighth/WaterElemental.cs b/Scripts/Spells/Eighth/WaterElemental.cs index 34a018226..384f9cb94 100644 --- a/Scripts/Spells/Eighth/WaterElemental.cs +++ b/Scripts/Spells/Eighth/WaterElemental.cs @@ -17,7 +17,7 @@ namespace Server.Spells.Eighth Reagent.SpidersSilk ); - public override SpellCircle Circle { get { return SpellCircle.Eighth; } } + public override SpellCircle Circle => SpellCircle.Eighth; public WaterElementalSpell( Mobile caster, Item scroll ) : base( caster, scroll, m_Info ) { @@ -52,4 +52,4 @@ namespace Server.Spells.Eighth FinishSequence(); } } -} \ No newline at end of file +} diff --git a/Scripts/Spells/Fifth/BladeSpirits.cs b/Scripts/Spells/Fifth/BladeSpirits.cs index 952c45f89..9565189d4 100644 --- a/Scripts/Spells/Fifth/BladeSpirits.cs +++ b/Scripts/Spells/Fifth/BladeSpirits.cs @@ -8,7 +8,7 @@ namespace Server.Spells.Fifth public class BladeSpiritsSpell : MagerySpell { private static SpellInfo m_Info = new SpellInfo( - "Blade Spirits", "In Jux Hur Ylem", + "Blade Spirits", "In Jux Hur Ylem", 266, 9040, false, @@ -17,7 +17,7 @@ namespace Server.Spells.Fifth Reagent.Nightshade ); - public override SpellCircle Circle { get { return SpellCircle.Fifth; } } + public override SpellCircle Circle => SpellCircle.Fifth; public BladeSpiritsSpell( Mobile caster, Item scroll ) : base( caster, scroll, m_Info ) { @@ -105,4 +105,4 @@ namespace Server.Spells.Fifth } } } -} \ No newline at end of file +} diff --git a/Scripts/Spells/Fifth/DispelField.cs b/Scripts/Spells/Fifth/DispelField.cs index b357a7074..e2749a346 100644 --- a/Scripts/Spells/Fifth/DispelField.cs +++ b/Scripts/Spells/Fifth/DispelField.cs @@ -18,7 +18,7 @@ namespace Server.Spells.Fifth Reagent.Garlic ); - public override SpellCircle Circle { get { return SpellCircle.Fifth; } } + public override SpellCircle Circle => SpellCircle.Fifth; public DispelFieldSpell( Mobile caster, Item scroll ) : base( caster, scroll, m_Info ) { @@ -85,4 +85,4 @@ namespace Server.Spells.Fifth } } } -} \ No newline at end of file +} diff --git a/Scripts/Spells/Fifth/Incognito.cs b/Scripts/Spells/Fifth/Incognito.cs index bd6a176b9..91768970a 100644 --- a/Scripts/Spells/Fifth/Incognito.cs +++ b/Scripts/Spells/Fifth/Incognito.cs @@ -21,7 +21,7 @@ namespace Server.Spells.Fifth Reagent.Nightshade ); - public override SpellCircle Circle { get { return SpellCircle.Fifth; } } + public override SpellCircle Circle => SpellCircle.Fifth; public IncognitoSpell( Mobile caster, Item scroll ) : base( caster, scroll, m_Info ) { diff --git a/Scripts/Spells/Fifth/MagicReflect.cs b/Scripts/Spells/Fifth/MagicReflect.cs index 44c7684c1..886462107 100644 --- a/Scripts/Spells/Fifth/MagicReflect.cs +++ b/Scripts/Spells/Fifth/MagicReflect.cs @@ -17,7 +17,7 @@ namespace Server.Spells.Fifth Reagent.SpidersSilk ); - public override SpellCircle Circle { get { return SpellCircle.Fifth; } } + public override SpellCircle Circle => SpellCircle.Fifth; public MagicReflectSpell( Mobile caster, Item scroll ) : base( caster, scroll, m_Info ) { @@ -52,7 +52,7 @@ namespace Server.Spells.Fifth * Physical decrease = 25 - (Inscription/20). * Elemental resistance = +10 (-20 physical, +10 elemental at GM Inscription) * The magic reflection spell has an indefinite duration, becoming active when cast, and deactivated when re-cast. - * Reactive Armor, Protection, and Magic Reflection will stay on—even after logging out, even after dying—until you “turn them off” by casting them again. + * Reactive Armor, Protection, and Magic Reflection will stay on�even after logging out, even after dying�until you �turn them off� by casting them again. */ if ( CheckSequence() ) diff --git a/Scripts/Spells/Fifth/MindBlast.cs b/Scripts/Spells/Fifth/MindBlast.cs index df52dc13f..ea37433f3 100644 --- a/Scripts/Spells/Fifth/MindBlast.cs +++ b/Scripts/Spells/Fifth/MindBlast.cs @@ -16,7 +16,7 @@ namespace Server.Spells.Fifth Reagent.SulfurousAsh ); - public override SpellCircle Circle { get { return SpellCircle.Fifth; } } + public override SpellCircle Circle => SpellCircle.Fifth; public MindBlastSpell( Mobile caster, Item scroll ) : base( caster, scroll, m_Info ) { diff --git a/Scripts/Spells/Fifth/Paralyze.cs b/Scripts/Spells/Fifth/Paralyze.cs index 7a2251e01..d16d80a4f 100644 --- a/Scripts/Spells/Fifth/Paralyze.cs +++ b/Scripts/Spells/Fifth/Paralyze.cs @@ -17,7 +17,7 @@ namespace Server.Spells.Fifth Reagent.SpidersSilk ); - public override SpellCircle Circle { get { return SpellCircle.Fifth; } } + public override SpellCircle Circle => SpellCircle.Fifth; public ParalyzeSpell( Mobile caster, Item scroll ) : base( caster, scroll, m_Info ) { @@ -45,11 +45,11 @@ namespace Server.Spells.Fifth SpellHelper.CheckReflect( (int)this.Circle, Caster, ref m ); double duration; - + if ( Core.AOS ) { int secs = (int)((GetDamageSkill( Caster ) / 10) - (GetResistSkill( m ) / 10)); - + if( !Core.SE ) secs += 2; @@ -109,4 +109,4 @@ namespace Server.Spells.Fifth } } } -} \ No newline at end of file +} diff --git a/Scripts/Spells/Fifth/PoisonField.cs b/Scripts/Spells/Fifth/PoisonField.cs index 368317cae..b6d01e6f2 100644 --- a/Scripts/Spells/Fifth/PoisonField.cs +++ b/Scripts/Spells/Fifth/PoisonField.cs @@ -20,7 +20,7 @@ namespace Server.Spells.Fifth Reagent.SpidersSilk ); - public override SpellCircle Circle { get { return SpellCircle.Fifth; } } + public override SpellCircle Circle => SpellCircle.Fifth; public PoisonFieldSpell( Mobile caster, Item scroll ) : base( caster, scroll, m_Info ) { diff --git a/Scripts/Spells/Fifth/SummonCreature.cs b/Scripts/Spells/Fifth/SummonCreature.cs index 921a42b0a..a0aa16ec9 100644 --- a/Scripts/Spells/Fifth/SummonCreature.cs +++ b/Scripts/Spells/Fifth/SummonCreature.cs @@ -16,7 +16,7 @@ namespace Server.Spells.Fifth Reagent.SpidersSilk ); - public override SpellCircle Circle { get { return SpellCircle.Fifth; } } + public override SpellCircle Circle => SpellCircle.Fifth; public SummonCreatureSpell( Mobile caster, Item scroll ) : base( caster, scroll, m_Info ) { @@ -95,4 +95,4 @@ namespace Server.Spells.Fifth return base.GetCastDelay() + TimeSpan.FromSeconds( 6.0 ); } } -} \ No newline at end of file +} diff --git a/Scripts/Spells/First/Clumsy.cs b/Scripts/Spells/First/Clumsy.cs index f2f9500c8..3c2a24c01 100644 --- a/Scripts/Spells/First/Clumsy.cs +++ b/Scripts/Spells/First/Clumsy.cs @@ -14,7 +14,7 @@ namespace Server.Spells.First Reagent.Nightshade ); - public override SpellCircle Circle { get { return SpellCircle.First; } } + public override SpellCircle Circle => SpellCircle.First; public ClumsySpell( Mobile caster, Item scroll ) : base( caster, scroll, m_Info ) { @@ -81,4 +81,4 @@ namespace Server.Spells.First } } } -} \ No newline at end of file +} diff --git a/Scripts/Spells/First/CreateFood.cs b/Scripts/Spells/First/CreateFood.cs index 81049a2f4..7917e6158 100644 --- a/Scripts/Spells/First/CreateFood.cs +++ b/Scripts/Spells/First/CreateFood.cs @@ -14,7 +14,7 @@ namespace Server.Spells.First Reagent.MandrakeRoot ); - public override SpellCircle Circle { get { return SpellCircle.First; } } + public override SpellCircle Circle => SpellCircle.First; public CreateFoodSpell( Mobile caster, Item scroll ) : base( caster, scroll, m_Info ) { @@ -87,4 +87,4 @@ namespace Server.Spells.First return item; } } -} \ No newline at end of file +} diff --git a/Scripts/Spells/First/Feeblemind.cs b/Scripts/Spells/First/Feeblemind.cs index ae5333483..d134c0c50 100644 --- a/Scripts/Spells/First/Feeblemind.cs +++ b/Scripts/Spells/First/Feeblemind.cs @@ -14,7 +14,7 @@ namespace Server.Spells.First Reagent.Nightshade ); - public override SpellCircle Circle { get { return SpellCircle.First; } } + public override SpellCircle Circle => SpellCircle.First; public FeeblemindSpell( Mobile caster, Item scroll ) : base( caster, scroll, m_Info ) { @@ -81,4 +81,4 @@ namespace Server.Spells.First } } } -} \ No newline at end of file +} diff --git a/Scripts/Spells/First/Heal.cs b/Scripts/Spells/First/Heal.cs index 6527d9abc..38a20c650 100644 --- a/Scripts/Spells/First/Heal.cs +++ b/Scripts/Spells/First/Heal.cs @@ -17,7 +17,7 @@ namespace Server.Spells.First Reagent.SpidersSilk ); - public override SpellCircle Circle { get { return SpellCircle.First; } } + public override SpellCircle Circle => SpellCircle.First; public HealSpell( Mobile caster, Item scroll ) : base( caster, scroll, m_Info ) { @@ -114,4 +114,4 @@ namespace Server.Spells.First } } } -} \ No newline at end of file +} diff --git a/Scripts/Spells/First/MagicArrow.cs b/Scripts/Spells/First/MagicArrow.cs index b1a22dc14..4d3665d84 100644 --- a/Scripts/Spells/First/MagicArrow.cs +++ b/Scripts/Spells/First/MagicArrow.cs @@ -13,13 +13,13 @@ namespace Server.Spells.First Reagent.SulfurousAsh ); - public override SpellCircle Circle { get { return SpellCircle.First; } } + public override SpellCircle Circle => SpellCircle.First; public MagicArrowSpell( Mobile caster, Item scroll ) : base( caster, scroll, m_Info ) { } - public override bool DelayedDamageStacking { get { return !Core.AOS; } } + public override bool DelayedDamageStacking => !Core.AOS; public override void OnCast() { diff --git a/Scripts/Spells/First/NightSight.cs b/Scripts/Spells/First/NightSight.cs index 7ec4a37e4..f1929a4b9 100644 --- a/Scripts/Spells/First/NightSight.cs +++ b/Scripts/Spells/First/NightSight.cs @@ -15,7 +15,7 @@ namespace Server.Spells.First Reagent.SpidersSilk ); - public override SpellCircle Circle { get { return SpellCircle.First; } } + public override SpellCircle Circle => SpellCircle.First; public NightSightSpell( Mobile caster, Item scroll ) : base( caster, scroll, m_Info ) { diff --git a/Scripts/Spells/First/ReactiveArmor.cs b/Scripts/Spells/First/ReactiveArmor.cs index f5114674e..94f5916ba 100644 --- a/Scripts/Spells/First/ReactiveArmor.cs +++ b/Scripts/Spells/First/ReactiveArmor.cs @@ -16,7 +16,7 @@ namespace Server.Spells.First Reagent.SulfurousAsh ); - public override SpellCircle Circle { get { return SpellCircle.First; } } + public override SpellCircle Circle => SpellCircle.First; public ReactiveArmorSpell( Mobile caster, Item scroll ) : base( caster, scroll, m_Info ) { @@ -50,8 +50,8 @@ namespace Server.Spells.First /* The reactive armor spell increases the caster's physical resistance, while lowering the caster's elemental resistances. * 15 + (Inscription/20) Physcial bonus * -5 Elemental - * The reactive armor spell has an indefinite duration, becoming active when cast, and deactivated when re-cast. - * Reactive Armor, Protection, and Magic Reflection will stay on—even after logging out, even after dying—until you “turn them off” by casting them again. + * The reactive armor spell has an indefinite duration, becoming active when cast, and deactivated when re-cast. + * Reactive Armor, Protection, and Magic Reflection will stay on�even after logging out, even after dying�until you �turn them off� by casting them again. * (+20 physical -5 elemental at 100 Inscription) */ @@ -155,4 +155,4 @@ namespace Server.Spells.First } } } -} \ No newline at end of file +} diff --git a/Scripts/Spells/First/Weaken.cs b/Scripts/Spells/First/Weaken.cs index d8a618280..50d85eb82 100644 --- a/Scripts/Spells/First/Weaken.cs +++ b/Scripts/Spells/First/Weaken.cs @@ -14,7 +14,7 @@ namespace Server.Spells.First Reagent.Nightshade ); - public override SpellCircle Circle { get { return SpellCircle.First; } } + public override SpellCircle Circle => SpellCircle.First; public WeakenSpell( Mobile caster, Item scroll ) : base( caster, scroll, m_Info ) { @@ -81,4 +81,4 @@ namespace Server.Spells.First } } } -} \ No newline at end of file +} diff --git a/Scripts/Spells/Fourth/ArchCure.cs b/Scripts/Spells/Fourth/ArchCure.cs index a2dfed733..840df749a 100644 --- a/Scripts/Spells/Fourth/ArchCure.cs +++ b/Scripts/Spells/Fourth/ArchCure.cs @@ -18,7 +18,7 @@ namespace Server.Spells.Fourth Reagent.MandrakeRoot ); - public override SpellCircle Circle { get { return SpellCircle.Fourth; } } + public override SpellCircle Circle => SpellCircle.Fourth; public ArchCureSpell( Mobile caster, Item scroll ) : base( caster, scroll, m_Info ) { @@ -30,7 +30,7 @@ namespace Server.Spells.Fourth } // Arch cure is now 1/4th of a second faster - public override TimeSpan CastDelayBase{ get{ return base.CastDelayBase - TimeSpan.FromSeconds( 0.25 ); } } + public override TimeSpan CastDelayBase => base.CastDelayBase - TimeSpan.FromSeconds( 0.25 ); public void Target( IPoint3D p ) { diff --git a/Scripts/Spells/Fourth/ArchProtection.cs b/Scripts/Spells/Fourth/ArchProtection.cs index 7202b1737..b47c32ef2 100644 --- a/Scripts/Spells/Fourth/ArchProtection.cs +++ b/Scripts/Spells/Fourth/ArchProtection.cs @@ -19,7 +19,7 @@ namespace Server.Spells.Fourth Reagent.SulfurousAsh ); - public override SpellCircle Circle { get { return SpellCircle.Fourth; } } + public override SpellCircle Circle => SpellCircle.Fourth; public ArchProtectionSpell( Mobile caster, Item scroll ) : base( caster, scroll, m_Info ) { @@ -90,7 +90,7 @@ namespace Server.Spells.Fourth { Caster.DoBeneficial( m ); m.VirtualArmorMod += val; - + AddEntry( m, val ); new InternalTimer( m, Caster ).Start(); diff --git a/Scripts/Spells/Fourth/Curse.cs b/Scripts/Spells/Fourth/Curse.cs index 906ba7cd2..6204038c6 100644 --- a/Scripts/Spells/Fourth/Curse.cs +++ b/Scripts/Spells/Fourth/Curse.cs @@ -16,7 +16,7 @@ namespace Server.Spells.Fourth Reagent.SulfurousAsh ); - public override SpellCircle Circle { get { return SpellCircle.Fourth; } } + public override SpellCircle Circle => SpellCircle.Fourth; public CurseSpell( Mobile caster, Item scroll ) : base( caster, scroll, m_Info ) { @@ -110,4 +110,4 @@ namespace Server.Spells.Fourth } } } -} \ No newline at end of file +} diff --git a/Scripts/Spells/Fourth/FireField.cs b/Scripts/Spells/Fourth/FireField.cs index 0a92972df..de07048b7 100644 --- a/Scripts/Spells/Fourth/FireField.cs +++ b/Scripts/Spells/Fourth/FireField.cs @@ -20,7 +20,7 @@ namespace Server.Spells.Fourth Reagent.SulfurousAsh ); - public override SpellCircle Circle { get { return SpellCircle.Fourth; } } + public override SpellCircle Circle => SpellCircle.Fourth; public FireFieldSpell( Mobile caster, Item scroll ) : base( caster, scroll, m_Info ) { diff --git a/Scripts/Spells/Fourth/GreaterHeal.cs b/Scripts/Spells/Fourth/GreaterHeal.cs index f9407f2ef..973b75ec9 100644 --- a/Scripts/Spells/Fourth/GreaterHeal.cs +++ b/Scripts/Spells/Fourth/GreaterHeal.cs @@ -18,7 +18,7 @@ namespace Server.Spells.Fourth Reagent.SpidersSilk ); - public override SpellCircle Circle { get { return SpellCircle.Fourth; } } + public override SpellCircle Circle => SpellCircle.Fourth; public GreaterHealSpell( Mobile caster, Item scroll ) : base( caster, scroll, m_Info ) { @@ -104,4 +104,4 @@ namespace Server.Spells.Fourth } } } -} \ No newline at end of file +} diff --git a/Scripts/Spells/Fourth/Lightning.cs b/Scripts/Spells/Fourth/Lightning.cs index c7e8e0f5d..3c69fb54b 100644 --- a/Scripts/Spells/Fourth/Lightning.cs +++ b/Scripts/Spells/Fourth/Lightning.cs @@ -14,7 +14,7 @@ namespace Server.Spells.Fourth Reagent.SulfurousAsh ); - public override SpellCircle Circle { get { return SpellCircle.Fourth; } } + public override SpellCircle Circle => SpellCircle.Fourth; public LightningSpell( Mobile caster, Item scroll ) : base( caster, scroll, m_Info ) { diff --git a/Scripts/Spells/Fourth/ManaDrain.cs b/Scripts/Spells/Fourth/ManaDrain.cs index 8d67e0483..0fc6806d8 100644 --- a/Scripts/Spells/Fourth/ManaDrain.cs +++ b/Scripts/Spells/Fourth/ManaDrain.cs @@ -16,7 +16,7 @@ namespace Server.Spells.Fourth Reagent.SpidersSilk ); - public override SpellCircle Circle { get { return SpellCircle.Fourth; } } + public override SpellCircle Circle => SpellCircle.Fourth; public ManaDrainSpell( Mobile caster, Item scroll ) : base( caster, scroll, m_Info ) { @@ -131,4 +131,4 @@ namespace Server.Spells.Fourth } } } -} \ No newline at end of file +} diff --git a/Scripts/Spells/Fourth/Recall.cs b/Scripts/Spells/Fourth/Recall.cs index a2cceff79..7a955cf9c 100644 --- a/Scripts/Spells/Fourth/Recall.cs +++ b/Scripts/Spells/Fourth/Recall.cs @@ -20,7 +20,7 @@ namespace Server.Spells.Fourth Reagent.MandrakeRoot ); - public override SpellCircle Circle { get { return SpellCircle.Fourth; } } + public override SpellCircle Circle => SpellCircle.Fourth; private RunebookEntry m_Entry; private Runebook m_Book; @@ -193,7 +193,7 @@ namespace Server.Spells.Fourth from.Send( new MessageLocalized( from.Serial, from.Body, MessageType.Regular, 0x3B2, 3, 502357, from.Name, "" ) ); // I can not recall from that object. } } - + protected override void OnNonlocalTarget( Mobile from, object o ) { } @@ -204,4 +204,4 @@ namespace Server.Spells.Fourth } } } -} \ No newline at end of file +} diff --git a/Scripts/Spells/Mysticism/AnimatedWeaponSpell.cs b/Scripts/Spells/Mysticism/AnimatedWeaponSpell.cs index 97397f5b8..9e7047025 100644 --- a/Scripts/Spells/Mysticism/AnimatedWeaponSpell.cs +++ b/Scripts/Spells/Mysticism/AnimatedWeaponSpell.cs @@ -16,10 +16,10 @@ namespace Server.Spells.Mysticism Reagent.Nightshade ); - public override TimeSpan CastDelayBase { get { return TimeSpan.FromSeconds( 1.5 ); } } + public override TimeSpan CastDelayBase => TimeSpan.FromSeconds( 1.5 ); - public override double RequiredSkill { get { return 33.0; } } - public override int RequiredMana { get { return 11; } } + public override double RequiredSkill => 33.0; + public override int RequiredMana => 11; public AnimatedWeaponSpell( Mobile caster, Item scroll ) : base( caster, scroll, m_Info ) diff --git a/Scripts/Spells/Mysticism/EagleStrikeSpell.cs b/Scripts/Spells/Mysticism/EagleStrikeSpell.cs index 2a09d0fa1..6a882972a 100644 --- a/Scripts/Spells/Mysticism/EagleStrikeSpell.cs +++ b/Scripts/Spells/Mysticism/EagleStrikeSpell.cs @@ -15,10 +15,10 @@ namespace Server.Spells.Mysticism Reagent.MandrakeRoot ); - public override TimeSpan CastDelayBase { get { return TimeSpan.FromSeconds( 1.25 ); } } + public override TimeSpan CastDelayBase => TimeSpan.FromSeconds( 1.25 ); - public override double RequiredSkill { get { return 20.0; } } - public override int RequiredMana { get { return 9; } } + public override double RequiredSkill => 20.0; + public override int RequiredMana => 9; public EagleStrikeSpell( Mobile caster, Item scroll ) : base( caster, scroll, m_Info ) diff --git a/Scripts/Spells/Mysticism/HailStormSpell.cs b/Scripts/Spells/Mysticism/HailStormSpell.cs index 75206e92e..a6cb032b4 100644 --- a/Scripts/Spells/Mysticism/HailStormSpell.cs +++ b/Scripts/Spells/Mysticism/HailStormSpell.cs @@ -17,10 +17,10 @@ namespace Server.Spells.Mysticism Reagent.MandrakeRoot ); - public override TimeSpan CastDelayBase { get { return TimeSpan.FromSeconds( 2.25 ); } } + public override TimeSpan CastDelayBase => TimeSpan.FromSeconds( 2.25 ); - public override double RequiredSkill { get { return 70.0; } } - public override int RequiredMana { get { return 40; } } + public override double RequiredSkill => 70.0; + public override int RequiredMana => 40; public HailStormSpell( Mobile caster, Item scroll ) : base( caster, scroll, m_Info ) diff --git a/Scripts/Spells/Mysticism/MysticSpell.cs b/Scripts/Spells/Mysticism/MysticSpell.cs index b45870046..fb65f3d1a 100644 --- a/Scripts/Spells/Mysticism/MysticSpell.cs +++ b/Scripts/Spells/Mysticism/MysticSpell.cs @@ -8,9 +8,9 @@ namespace Server.Spells.Mysticism public abstract double RequiredSkill { get; } public abstract int RequiredMana { get; } - public override SkillName CastSkill { get { return SkillName.Mysticism; } } + public override SkillName CastSkill => SkillName.Mysticism; - /* + /* * As per OSI Publish 64: * Imbuing is not the only skill associated with Mysticism now. * Players can use EITHER their Focus skill or Imbuing skill. @@ -89,4 +89,4 @@ namespace Server.Spells.Mysticism return Math.Max( m.Skills[SkillName.Imbuing].Value, m.Skills[SkillName.Focus].Value ); } } -} \ No newline at end of file +} diff --git a/Scripts/Spells/Mysticism/NetherCycloneSpell.cs b/Scripts/Spells/Mysticism/NetherCycloneSpell.cs index 3985e54f9..677db0d2a 100644 --- a/Scripts/Spells/Mysticism/NetherCycloneSpell.cs +++ b/Scripts/Spells/Mysticism/NetherCycloneSpell.cs @@ -17,10 +17,10 @@ namespace Server.Spells.Mysticism Reagent.Bloodmoss ); - public override TimeSpan CastDelayBase { get { return TimeSpan.FromSeconds( 2.5 ); } } + public override TimeSpan CastDelayBase => TimeSpan.FromSeconds( 2.5 ); - public override double RequiredSkill { get { return 83.0; } } - public override int RequiredMana { get { return 50; } } + public override double RequiredSkill => 83.0; + public override int RequiredMana => 50; public NetherCycloneSpell( Mobile caster, Item scroll ) : base( caster, scroll, m_Info ) diff --git a/Scripts/Spells/Mysticism/SpellPlagueSpell.cs b/Scripts/Spells/Mysticism/SpellPlagueSpell.cs index b35c9e5da..d6d2848d1 100644 --- a/Scripts/Spells/Mysticism/SpellPlagueSpell.cs +++ b/Scripts/Spells/Mysticism/SpellPlagueSpell.cs @@ -21,10 +21,10 @@ namespace Server.Spells.Mysticism Reagent.SulfurousAsh ); - public override TimeSpan CastDelayBase { get { return TimeSpan.FromSeconds( 2.25 ); } } + public override TimeSpan CastDelayBase => TimeSpan.FromSeconds( 2.25 ); - public override double RequiredSkill { get { return 70.0; } } - public override int RequiredMana { get { return 40; } } + public override double RequiredSkill => 70.0; + public override int RequiredMana => 40; public SpellPlagueSpell( Mobile caster, Item scroll ) : base( caster, scroll, m_Info ) diff --git a/Scripts/Spells/Mysticism/StoneFormSpell.cs b/Scripts/Spells/Mysticism/StoneFormSpell.cs index 300cb68ec..be99ab2d8 100644 --- a/Scripts/Spells/Mysticism/StoneFormSpell.cs +++ b/Scripts/Spells/Mysticism/StoneFormSpell.cs @@ -22,10 +22,10 @@ namespace Server.Spells.Mysticism Reagent.Garlic ); - public override TimeSpan CastDelayBase { get { return TimeSpan.FromSeconds( 1.5 ); } } + public override TimeSpan CastDelayBase => TimeSpan.FromSeconds( 1.5 ); - public override double RequiredSkill { get { return 33.0; } } - public override int RequiredMana { get { return 11; } } + public override double RequiredSkill => 33.0; + public override int RequiredMana => 11; private static Hashtable m_Table = new Hashtable(); diff --git a/Scripts/Spells/Necromancy/AnimateDeadSpell.cs b/Scripts/Spells/Necromancy/AnimateDeadSpell.cs index cbcde3be0..aa4f41dd5 100644 --- a/Scripts/Spells/Necromancy/AnimateDeadSpell.cs +++ b/Scripts/Spells/Necromancy/AnimateDeadSpell.cs @@ -19,10 +19,10 @@ namespace Server.Spells.Necromancy Reagent.DaemonBlood ); - public override TimeSpan CastDelayBase { get { return TimeSpan.FromSeconds( 1.5 ); } } + public override TimeSpan CastDelayBase => TimeSpan.FromSeconds( 1.5 ); - public override double RequiredSkill{ get{ return 40.0; } } - public override int RequiredMana{ get{ return 23; } } + public override double RequiredSkill => 40.0; + public override int RequiredMana => 23; public AnimateDeadSpell( Mobile caster, Item scroll ) : base( caster, scroll, m_Info ) { @@ -239,8 +239,7 @@ namespace Server.Spells.Necromancy if ( master == null ) return; - List list = null; - m_Table.TryGetValue( master, out list ); + m_Table.TryGetValue( master, out List list ); if ( list == null ) return; @@ -256,8 +255,7 @@ namespace Server.Spells.Necromancy if ( master == null ) return; - List list = null; - m_Table.TryGetValue( master, out list ); + m_Table.TryGetValue( master, out List list ); if ( list == null ) m_Table[master] = list = new List(); @@ -418,4 +416,4 @@ namespace Server.Spells.Necromancy } } } -} \ No newline at end of file +} diff --git a/Scripts/Spells/Necromancy/BloodOathSpell.cs b/Scripts/Spells/Necromancy/BloodOathSpell.cs index 15b9afd40..76da6dfbd 100644 --- a/Scripts/Spells/Necromancy/BloodOathSpell.cs +++ b/Scripts/Spells/Necromancy/BloodOathSpell.cs @@ -15,10 +15,10 @@ namespace Server.Spells.Necromancy Reagent.DaemonBlood ); - public override TimeSpan CastDelayBase { get { return TimeSpan.FromSeconds( 1.5 ); } } + public override TimeSpan CastDelayBase => TimeSpan.FromSeconds( 1.5 ); - public override double RequiredSkill{ get{ return 20.0; } } - public override int RequiredMana{ get{ return 13; } } + public override double RequiredSkill => 20.0; + public override int RequiredMana => 13; public BloodOathSpell( Mobile caster, Item scroll ) : base( caster, scroll, m_Info ) { @@ -53,7 +53,7 @@ namespace Server.Spells.Necromancy /* Temporarily creates a dark pact between the caster and the target. * Any damage dealt by the target to the caster is increased, but the target receives the same amount of damage. * The effect lasts for ((Spirit Speak skill level - target's Resist Magic skill level) / 80 ) + 8 seconds. - * + * * NOTE: The above algorithm must be fixed point, it should be: * ((ss-rm)/8)+8 */ @@ -67,7 +67,7 @@ namespace Server.Spells.Necromancy if ( m.Spell != null ) m.Spell.OnCasterHurt(); - + Caster.PlaySound( 0x175 ); Caster.FixedParticles( 0x375A, 1, 17, 9919, 33, 7, EffectLayer.Waist ); @@ -187,4 +187,4 @@ namespace Server.Spells.Necromancy } } } -} \ No newline at end of file +} diff --git a/Scripts/Spells/Necromancy/CorpseSkin.cs b/Scripts/Spells/Necromancy/CorpseSkin.cs index b3b2b1495..53a5ab9a6 100644 --- a/Scripts/Spells/Necromancy/CorpseSkin.cs +++ b/Scripts/Spells/Necromancy/CorpseSkin.cs @@ -16,10 +16,10 @@ namespace Server.Spells.Necromancy Reagent.GraveDust ); - public override TimeSpan CastDelayBase { get { return TimeSpan.FromSeconds( 1.5 ); } } + public override TimeSpan CastDelayBase => TimeSpan.FromSeconds( 1.5 ); - public override double RequiredSkill{ get{ return 20.0; } } - public override int RequiredMana{ get{ return 11; } } + public override double RequiredSkill => 20.0; + public override int RequiredMana => 11; public CorpseSkinSpell( Mobile caster, Item scroll ) : base( caster, scroll, m_Info ) { @@ -39,12 +39,12 @@ namespace Server.Spells.Necromancy /* Transmogrifies the flesh of the target creature or player to resemble rotted corpse flesh, * making them more vulnerable to Fire and Poison damage, * but increasing their resistance to Physical and Cold damage. - * + * * The effect lasts for ((Spirit Speak skill level - target's Resist Magic skill level) / 25 ) + 40 seconds. - * + * * NOTE: Algorithm above is fixed point, should be: * ((ss-mr)/2.5) + 40 - * + * * NOTE: Resistance is not checked if targeting yourself */ @@ -57,7 +57,7 @@ namespace Server.Spells.Necromancy if ( m.Spell != null ) m.Spell.OnCasterHurt(); - + m.FixedParticles( 0x373A, 1, 15, 9913, 67, 7, EffectLayer.Head ); m.PlaySound( 0x1BB ); @@ -154,4 +154,4 @@ namespace Server.Spells.Necromancy } } } -} \ No newline at end of file +} diff --git a/Scripts/Spells/Necromancy/CurseWeapon.cs b/Scripts/Spells/Necromancy/CurseWeapon.cs index 81b9092a4..189c0de6a 100644 --- a/Scripts/Spells/Necromancy/CurseWeapon.cs +++ b/Scripts/Spells/Necromancy/CurseWeapon.cs @@ -15,10 +15,10 @@ namespace Server.Spells.Necromancy Reagent.PigIron ); - public override TimeSpan CastDelayBase { get { return TimeSpan.FromSeconds( 0.75 ); } } + public override TimeSpan CastDelayBase => TimeSpan.FromSeconds( 0.75 ); - public override double RequiredSkill{ get{ return 0.0; } } - public override int RequiredMana{ get{ return 7; } } + public override double RequiredSkill => 0.0; + public override int RequiredMana => 7; public CurseWeaponSpell( Mobile caster, Item scroll ) : base( caster, scroll, m_Info ) { @@ -37,10 +37,10 @@ namespace Server.Spells.Necromancy /* Temporarily imbues a weapon with a life draining effect. * Half the damage that the weapon inflicts is added to the necromancer's health. * The effects lasts for (Spirit Speak skill level / 34) + 1 seconds. - * + * * NOTE: Above algorithm is fixed point, should be : * (Spirit Speak skill level / 3.4) + 1 - * + * * TODO: What happens if you curse a weapon then give it to someone else? Should they get the drain effect? */ @@ -103,4 +103,4 @@ namespace Server.Spells.Necromancy } } } -} \ No newline at end of file +} diff --git a/Scripts/Spells/Necromancy/EvilOmen.cs b/Scripts/Spells/Necromancy/EvilOmen.cs index d09f3476d..c67f6069b 100644 --- a/Scripts/Spells/Necromancy/EvilOmen.cs +++ b/Scripts/Spells/Necromancy/EvilOmen.cs @@ -15,10 +15,10 @@ namespace Server.Spells.Necromancy Reagent.NoxCrystal ); - public override TimeSpan CastDelayBase { get { return TimeSpan.FromSeconds(0.75); } } + public override TimeSpan CastDelayBase => TimeSpan.FromSeconds(0.75); - public override double RequiredSkill { get { return 20.0; } } - public override int RequiredMana { get { return 11; } } + public override double RequiredSkill => 20.0; + public override int RequiredMana => 11; public EvilOmenSpell(Mobile caster, Item scroll) : base(caster, scroll, m_Info) @@ -130,4 +130,4 @@ namespace Server.Spells.Necromancy } } } -} \ No newline at end of file +} diff --git a/Scripts/Spells/Necromancy/Exorcism.cs b/Scripts/Spells/Necromancy/Exorcism.cs index 1fe6e6232..224552d7f 100644 --- a/Scripts/Spells/Necromancy/Exorcism.cs +++ b/Scripts/Spells/Necromancy/Exorcism.cs @@ -20,10 +20,10 @@ namespace Server.Spells.Necromancy Reagent.GraveDust ); - public override TimeSpan CastDelayBase { get { return TimeSpan.FromSeconds( 2.0 ); } } + public override TimeSpan CastDelayBase => TimeSpan.FromSeconds( 2.0 ); - public override double RequiredSkill { get { return 80.0; } } - public override int RequiredMana { get { return 40; } } + public override double RequiredSkill => 80.0; + public override int RequiredMana => 40; public ExorcismSpell( Mobile caster, Item scroll ) : base( caster, scroll, m_Info ) { diff --git a/Scripts/Spells/Necromancy/HorrificBeast.cs b/Scripts/Spells/Necromancy/HorrificBeast.cs index 947c61fc0..83db4523c 100644 --- a/Scripts/Spells/Necromancy/HorrificBeast.cs +++ b/Scripts/Spells/Necromancy/HorrificBeast.cs @@ -16,12 +16,12 @@ namespace Server.Spells.Necromancy Reagent.DaemonBlood ); - public override TimeSpan CastDelayBase { get { return TimeSpan.FromSeconds( 2.0 ); } } + public override TimeSpan CastDelayBase => TimeSpan.FromSeconds( 2.0 ); - public override double RequiredSkill{ get{ return 40.0; } } - public override int RequiredMana{ get{ return 11; } } + public override double RequiredSkill => 40.0; + public override int RequiredMana => 11; - public override int Body{ get{ return 746; } } + public override int Body => 746; public HorrificBeastSpell( Mobile caster, Item scroll ) : base( caster, scroll, m_Info ) { @@ -41,4 +41,4 @@ namespace Server.Spells.Necromancy m.Delta( MobileDelta.WeaponDamage ); } } -} \ No newline at end of file +} diff --git a/Scripts/Spells/Necromancy/LichForm.cs b/Scripts/Spells/Necromancy/LichForm.cs index 96aaa0101..ee7dfc33e 100644 --- a/Scripts/Spells/Necromancy/LichForm.cs +++ b/Scripts/Spells/Necromancy/LichForm.cs @@ -17,18 +17,18 @@ namespace Server.Spells.Necromancy Reagent.NoxCrystal ); - public override TimeSpan CastDelayBase { get { return TimeSpan.FromSeconds( 2.0 ); } } + public override TimeSpan CastDelayBase => TimeSpan.FromSeconds( 2.0 ); - public override double RequiredSkill{ get{ return 70.0; } } - public override int RequiredMana{ get{ return 23; } } + public override double RequiredSkill => 70.0; + public override int RequiredMana => 23; - public override int Body{ get{ return 749; } } + public override int Body => 749; - public override int FireResistOffset{ get{ return -10; } } - public override int ColdResistOffset{ get{ return +10; } } - public override int PoisResistOffset{ get{ return +10; } } + public override int FireResistOffset => -10; + public override int ColdResistOffset => +10; + public override int PoisResistOffset => +10; - public override double TickRate{ get{ return 2.5; } } + public override double TickRate => 2.5; public LichFormSpell( Mobile caster, Item scroll ) : base( caster, scroll, m_Info ) { @@ -45,4 +45,4 @@ namespace Server.Spells.Necromancy --m.Hits; } } -} \ No newline at end of file +} diff --git a/Scripts/Spells/Necromancy/MindRot.cs b/Scripts/Spells/Necromancy/MindRot.cs index ede8cd442..b8875282b 100644 --- a/Scripts/Spells/Necromancy/MindRot.cs +++ b/Scripts/Spells/Necromancy/MindRot.cs @@ -17,10 +17,10 @@ namespace Server.Spells.Necromancy Reagent.DaemonBlood ); - public override TimeSpan CastDelayBase { get { return TimeSpan.FromSeconds( 1.5 ); } } + public override TimeSpan CastDelayBase => TimeSpan.FromSeconds( 1.5 ); - public override double RequiredSkill{ get{ return 30.0; } } - public override int RequiredMana{ get{ return 17; } } + public override double RequiredSkill => 30.0; + public override int RequiredMana => 17; public MindRotSpell( Mobile caster, Item scroll ) : base( caster, scroll, m_Info ) { @@ -48,7 +48,7 @@ namespace Server.Spells.Necromancy if ( m.Spell != null ) m.Spell.OnCasterHurt(); - + m.PlaySound( 0x1FB ); m.PlaySound( 0x258 ); m.FixedParticles( 0x373A, 1, 17, 9903, 15, 4, EffectLayer.Head ); @@ -147,7 +147,7 @@ namespace Server.Spells.Necromancy m_End = DateTime.UtcNow + delay; Priority = TimerPriority.TwoFiftyMS; } - + public void RenewDelay(TimeSpan delay) { m_End = DateTime.UtcNow + delay; @@ -179,4 +179,4 @@ namespace Server.Spells.Necromancy public double m_Scalar; public MRExpireTimer m_MRExpireTimer; } -} \ No newline at end of file +} diff --git a/Scripts/Spells/Necromancy/NecromancerSpell.cs b/Scripts/Spells/Necromancy/NecromancerSpell.cs index c2647331f..91a5e15a6 100644 --- a/Scripts/Spells/Necromancy/NecromancerSpell.cs +++ b/Scripts/Spells/Necromancy/NecromancerSpell.cs @@ -9,14 +9,14 @@ namespace Server.Spells.Necromancy public abstract double RequiredSkill{ get; } public abstract int RequiredMana{ get; } - public override SkillName CastSkill{ get{ return SkillName.Necromancy; } } - public override SkillName DamageSkill{ get{ return SkillName.SpiritSpeak; } } + public override SkillName CastSkill => SkillName.Necromancy; + public override SkillName DamageSkill => SkillName.SpiritSpeak; - //public override int CastDelayBase{ get{ return base.CastDelayBase; } } // Reference, 3 + //public override int CastDelayBase => base.CastDelayBase; // Reference, 3 public override bool ClearHandsOnCast => false; - public override double CastDelayFastScalar{ get{ return (Core.SE? base.CastDelayFastScalar : 0); } } // Necromancer spells are not affected by fast cast items, though they are by fast cast recovery + public override double CastDelayFastScalar => (Core.SE? base.CastDelayFastScalar : 0); // Necromancer spells are not affected by fast cast items, though they are by fast cast recovery public NecromancerSpell( Mobile caster, Item scroll, SpellInfo info ) : base( caster, scroll, info ) { diff --git a/Scripts/Spells/Necromancy/PainSpike.cs b/Scripts/Spells/Necromancy/PainSpike.cs index b0771d6b3..35bdf1f2e 100644 --- a/Scripts/Spells/Necromancy/PainSpike.cs +++ b/Scripts/Spells/Necromancy/PainSpike.cs @@ -16,10 +16,10 @@ namespace Server.Spells.Necromancy Reagent.PigIron ); - public override TimeSpan CastDelayBase { get { return TimeSpan.FromSeconds( 1.0 ); } } + public override TimeSpan CastDelayBase => TimeSpan.FromSeconds( 1.0 ); - public override double RequiredSkill{ get{ return 20.0; } } - public override int RequiredMana{ get{ return 5; } } + public override double RequiredSkill => 20.0; + public override int RequiredMana => 5; public PainSpikeSpell( Mobile caster, Item scroll ) : base( caster, scroll, m_Info ) { diff --git a/Scripts/Spells/Necromancy/PoisonStrike.cs b/Scripts/Spells/Necromancy/PoisonStrike.cs index a69a97f1a..30d6de652 100644 --- a/Scripts/Spells/Necromancy/PoisonStrike.cs +++ b/Scripts/Spells/Necromancy/PoisonStrike.cs @@ -16,10 +16,10 @@ namespace Server.Spells.Necromancy Reagent.NoxCrystal ); - public override TimeSpan CastDelayBase { get { return TimeSpan.FromSeconds( (Core.ML ? 1.75 : 1.5) ); } } + public override TimeSpan CastDelayBase => TimeSpan.FromSeconds( (Core.ML ? 1.75 : 1.5) ); - public override double RequiredSkill { get { return 50.0; } } - public override int RequiredMana { get { return 17; } } + public override double RequiredSkill => 50.0; + public override int RequiredMana => 17; public PoisonStrikeSpell( Mobile caster, Item scroll ) : base( caster, scroll, m_Info ) diff --git a/Scripts/Spells/Necromancy/Strangle.cs b/Scripts/Spells/Necromancy/Strangle.cs index afd6c2fec..0c58262cf 100644 --- a/Scripts/Spells/Necromancy/Strangle.cs +++ b/Scripts/Spells/Necromancy/Strangle.cs @@ -16,10 +16,10 @@ namespace Server.Spells.Necromancy Reagent.NoxCrystal ); - public override TimeSpan CastDelayBase { get { return TimeSpan.FromSeconds( 2.0 ); } } + public override TimeSpan CastDelayBase => TimeSpan.FromSeconds( 2.0 ); - public override double RequiredSkill{ get{ return 65.0; } } - public override int RequiredMana{ get{ return 29; } } + public override double RequiredSkill => 65.0; + public override int RequiredMana => 29; public StrangleSpell( Mobile caster, Item scroll ) : base( caster, scroll, m_Info ) { @@ -54,7 +54,7 @@ namespace Server.Spells.Necromancy if ( m.Spell != null ) m.Spell.OnCasterHurt(); - + m.PlaySound( 0x22F ); m.FixedParticles( 0x36CB, 1, 9, 9911, 67, 5, EffectLayer.Head ); m.FixedParticles( 0x374A, 1, 17, 9502, 1108, 4, (EffectLayer)255 ); @@ -210,7 +210,7 @@ namespace Server.Spells.Necromancy damage *= 1.75; AOS.Damage( m_Target, m_From, (int)damage, 0, 0, 0, 100, 0 ); - + if ( 0.60 <= Utility.RandomDouble() ) // OSI: randomly revealed between first and third damage tick, guessing 60% chance m_Target.RevealingAction(); } @@ -238,4 +238,4 @@ namespace Server.Spells.Necromancy } } } -} \ No newline at end of file +} diff --git a/Scripts/Spells/Necromancy/SummonFamiliar.cs b/Scripts/Spells/Necromancy/SummonFamiliar.cs index 906fa6ee7..22a54b68e 100644 --- a/Scripts/Spells/Necromancy/SummonFamiliar.cs +++ b/Scripts/Spells/Necromancy/SummonFamiliar.cs @@ -19,10 +19,10 @@ namespace Server.Spells.Necromancy Reagent.DaemonBlood ); - public override TimeSpan CastDelayBase { get { return TimeSpan.FromSeconds( 2.0 ); } } + public override TimeSpan CastDelayBase => TimeSpan.FromSeconds( 2.0 ); - public override double RequiredSkill{ get{ return 30.0; } } - public override int RequiredMana{ get{ return 17; } } + public override double RequiredSkill => 30.0; + public override int RequiredMana => 17; public SummonFamiliarSpell( Mobile caster, Item scroll ) : base( caster, scroll, m_Info ) { @@ -207,4 +207,4 @@ namespace Server.Spells.Necromancy } } } -} \ No newline at end of file +} diff --git a/Scripts/Spells/Necromancy/VampiricEmbrace.cs b/Scripts/Spells/Necromancy/VampiricEmbrace.cs index e1aace8ee..877815426 100644 --- a/Scripts/Spells/Necromancy/VampiricEmbrace.cs +++ b/Scripts/Spells/Necromancy/VampiricEmbrace.cs @@ -17,15 +17,15 @@ namespace Server.Spells.Necromancy Reagent.PigIron ); - public override TimeSpan CastDelayBase { get { return TimeSpan.FromSeconds( 2.0 ); } } + public override TimeSpan CastDelayBase => TimeSpan.FromSeconds( 2.0 ); - public override double RequiredSkill{ get{ return 99.0; } } - public override int RequiredMana{ get{ return 23; } } + public override double RequiredSkill => 99.0; + public override int RequiredMana => 23; - public override int Body{ get{ return Caster.Female ? 745 : 744; } } - public override int Hue{ get{ return 0x847E; } } + public override int Body => Caster.Female ? 745 : 744; + public override int Hue => 0x847E; - public override int FireResistOffset{ get{ return -25; } } + public override int FireResistOffset => -25; public VampiricEmbraceSpell( Mobile caster, Item scroll ) : base( caster, scroll, m_Info ) { @@ -51,4 +51,4 @@ namespace Server.Spells.Necromancy Effects.PlaySound( m.Location, m.Map, 0x4B1 ); } } -} \ No newline at end of file +} diff --git a/Scripts/Spells/Necromancy/VengefulSpirit.cs b/Scripts/Spells/Necromancy/VengefulSpirit.cs index 67831bbe6..c64007632 100644 --- a/Scripts/Spells/Necromancy/VengefulSpirit.cs +++ b/Scripts/Spells/Necromancy/VengefulSpirit.cs @@ -18,10 +18,10 @@ namespace Server.Spells.Necromancy Reagent.PigIron ); - public override TimeSpan CastDelayBase { get { return TimeSpan.FromSeconds( 2.0 ); } } + public override TimeSpan CastDelayBase => TimeSpan.FromSeconds( 2.0 ); - public override double RequiredSkill{ get{ return 80.0; } } - public override int RequiredMana{ get{ return 41; } } + public override double RequiredSkill => 80.0; + public override int RequiredMana => 41; public VengefulSpiritSpell( Mobile caster, Item scroll ) : base( caster, scroll, m_Info ) { @@ -94,4 +94,4 @@ namespace Server.Spells.Necromancy } } } -} \ No newline at end of file +} diff --git a/Scripts/Spells/Necromancy/Wither.cs b/Scripts/Spells/Necromancy/Wither.cs index 3bebcd188..667f07ca1 100644 --- a/Scripts/Spells/Necromancy/Wither.cs +++ b/Scripts/Spells/Necromancy/Wither.cs @@ -16,11 +16,11 @@ namespace Server.Spells.Necromancy Reagent.PigIron ); - public override TimeSpan CastDelayBase { get { return TimeSpan.FromSeconds( 1.5 ); } } + public override TimeSpan CastDelayBase => TimeSpan.FromSeconds( 1.5 ); - public override double RequiredSkill { get { return 60.0; } } + public override double RequiredSkill => 60.0; - public override int RequiredMana { get { return 23; } } + public override int RequiredMana => 23; public WitherSpell( Mobile caster, Item scroll ) : base( caster, scroll, m_Info ) diff --git a/Scripts/Spells/Necromancy/WraithForm.cs b/Scripts/Spells/Necromancy/WraithForm.cs index 2d78c09e7..1b9514148 100644 --- a/Scripts/Spells/Necromancy/WraithForm.cs +++ b/Scripts/Spells/Necromancy/WraithForm.cs @@ -17,19 +17,19 @@ namespace Server.Spells.Necromancy Reagent.PigIron ); - public override TimeSpan CastDelayBase { get { return TimeSpan.FromSeconds( 2.0 ); } } + public override TimeSpan CastDelayBase => TimeSpan.FromSeconds( 2.0 ); - public override double RequiredSkill{ get{ return 20.0; } } - public override int RequiredMana{ get{ return 17; } } + public override double RequiredSkill => 20.0; + public override int RequiredMana => 17; - public override int Body{ get{ return Caster.Female ? 747 : 748; } } - public override int Hue{ get{ return Caster.Female ? 0 : 0x4001; } } + public override int Body => Caster.Female ? 747 : 748; + public override int Hue => Caster.Female ? 0 : 0x4001; - public override int PhysResistOffset{ get{ return +15; } } - public override int FireResistOffset{ get{ return -5; } } - public override int ColdResistOffset{ get{ return 0; } } - public override int PoisResistOffset{ get{ return 0; } } - public override int NrgyResistOffset{ get{ return -5; } } + public override int PhysResistOffset => +15; + public override int FireResistOffset => -5; + public override int ColdResistOffset => 0; + public override int PoisResistOffset => 0; + public override int NrgyResistOffset => -5; public WraithFormSpell( Mobile caster, Item scroll ) : base( caster, scroll, m_Info ) { @@ -39,15 +39,15 @@ namespace Server.Spells.Necromancy { if ( m is PlayerMobile ) ((PlayerMobile)m).IgnoreMobiles = true; - + m.PlaySound( 0x17F ); m.FixedParticles( 0x374A, 1, 15, 9902, 1108, 4, EffectLayer.Waist ); } - + public override void RemoveEffect( Mobile m ) { if ( m is PlayerMobile && m.AccessLevel == AccessLevel.Player ) ((PlayerMobile)m).IgnoreMobiles = false; } } -} \ No newline at end of file +} diff --git a/Scripts/Spells/Ninjitsu/AnimalForm.cs b/Scripts/Spells/Ninjitsu/AnimalForm.cs index dfe0bc299..098e73816 100644 --- a/Scripts/Spells/Ninjitsu/AnimalForm.cs +++ b/Scripts/Spells/Ninjitsu/AnimalForm.cs @@ -30,11 +30,11 @@ namespace Server.Spells.Ninjitsu 9002 ); - public override TimeSpan CastDelayBase { get { return TimeSpan.FromSeconds(1.0); } } + public override TimeSpan CastDelayBase => TimeSpan.FromSeconds(1.0); - public override double RequiredSkill { get { return 0.0; } } - public override int RequiredMana { get { return (Core.ML ? 10 : 0); } } - public override int CastRecoveryBase { get { return (Core.ML ? 10 : base.CastRecoveryBase); } } + public override double RequiredSkill => 0.0; + public override int RequiredMana => (Core.ML ? 10 : 0); + public override int CastRecoveryBase => (Core.ML ? 10 : base.CastRecoveryBase); public override bool BlockedByAnimalForm => false; @@ -332,17 +332,17 @@ namespace Server.Spells.Ninjitsu private bool m_SpeedBoost; private bool m_StealingBonus; - public Type Type { get { return m_Type; } } - public TextDefinition Name { get { return m_Name; } } - public int ItemID { get { return m_ItemID; } } - public int Hue { get { return m_Hue; } } - public int Tooltip { get { return m_Tooltip; } } - public double ReqSkill { get { return m_ReqSkill; } } - public int BodyMod { get { return m_BodyMod; } } + public Type Type => m_Type; + public TextDefinition Name => m_Name; + public int ItemID => m_ItemID; + public int Hue => m_Hue; + public int Tooltip => m_Tooltip; + public double ReqSkill => m_ReqSkill; + public int BodyMod => m_BodyMod; public int HueMod { get { return Utility.RandomMinMax( m_HueModMin, m_HueModMax ); } } - public bool StealthBonus { get { return m_StealthBonus; } } - public bool SpeedBoost { get { return m_SpeedBoost; } } - public bool StealingBonus { get { return m_StealingBonus; } } + public bool StealthBonus => m_StealthBonus; + public bool SpeedBoost => m_SpeedBoost; + public bool StealingBonus => m_StealingBonus; /* private AnimalFormCallback m_TransformCallback; private AnimalFormCallback m_UntransformCallback; @@ -386,7 +386,7 @@ namespace Server.Spells.Ninjitsu new AnimalFormEntry( typeof( Reptalon ), 1075202, 11669, 0, 1075222, 90.0, 0x114, 0, 0, false, false, false ), }; - public static AnimalFormEntry[] Entries { get { return m_Entries; } } + public static AnimalFormEntry[] Entries => m_Entries; public class AnimalFormGump : Gump { @@ -507,11 +507,11 @@ namespace Server.Spells.Ninjitsu private Type m_Type; private SkillMod m_StealingMod; - public Timer Timer { get { return m_Timer; } } - public SkillMod Mod { get { return m_Mod; } } - public bool SpeedBoost { get { return m_SpeedBoost; } } - public Type Type { get { return m_Type; } } - public SkillMod StealingMod { get { return m_StealingMod; } } + public Timer Timer => m_Timer; + public SkillMod Mod => m_Mod; + public bool SpeedBoost => m_SpeedBoost; + public Type Type => m_Type; + public SkillMod StealingMod => m_StealingMod; public AnimalFormContext(Timer timer, SkillMod mod, bool speedBoost, Type type, SkillMod stealingMod) { diff --git a/Scripts/Spells/Ninjitsu/Backstab.cs b/Scripts/Spells/Ninjitsu/Backstab.cs index 31eef4962..0b30b8cbc 100644 --- a/Scripts/Spells/Ninjitsu/Backstab.cs +++ b/Scripts/Spells/Ninjitsu/Backstab.cs @@ -14,10 +14,10 @@ namespace Server.Spells.Ninjitsu { } - public override int BaseMana{ get{ return 30; } } - public override double RequiredSkill{ get{ return Core.ML ? 40.0 : 20.0; } } + public override int BaseMana => 30; + public override double RequiredSkill => Core.ML ? 40.0 : 20.0; - public override TextDefinition AbilityMessage{ get{ return new TextDefinition( 1063089 ); } } // You prepare to Backstab your opponent. + public override TextDefinition AbilityMessage => new TextDefinition( 1063089 ); // You prepare to Backstab your opponent. public override double GetDamageScalar( Mobile attacker, Mobile defender ) { diff --git a/Scripts/Spells/Ninjitsu/DeathStrike.cs b/Scripts/Spells/Ninjitsu/DeathStrike.cs index 3223095bf..67c12f0b4 100644 --- a/Scripts/Spells/Ninjitsu/DeathStrike.cs +++ b/Scripts/Spells/Ninjitsu/DeathStrike.cs @@ -14,10 +14,10 @@ namespace Server.Spells.Ninjitsu { } - public override int BaseMana { get { return 30; } } - public override double RequiredSkill { get { return 85.0; } } + public override int BaseMana => 30; + public override double RequiredSkill => 85.0; - public override TextDefinition AbilityMessage { get { return new TextDefinition( 1063091 ); } } // You prepare to hit your opponent with a Death Strike. + public override TextDefinition AbilityMessage => new TextDefinition( 1063091 ); // You prepare to hit your opponent with a Death Strike. public override double GetDamageScalar( Mobile attacker, Mobile defender ) { @@ -169,4 +169,4 @@ namespace Server.Spells.Ninjitsu m_Table.Remove( info.m_Target ); } } -} \ No newline at end of file +} diff --git a/Scripts/Spells/Ninjitsu/FocusAttack.cs b/Scripts/Spells/Ninjitsu/FocusAttack.cs index 6a5fce8be..fba14ea3c 100644 --- a/Scripts/Spells/Ninjitsu/FocusAttack.cs +++ b/Scripts/Spells/Ninjitsu/FocusAttack.cs @@ -13,10 +13,10 @@ namespace Server.Spells.Ninjitsu { } - public override int BaseMana{ get{ return Core.ML ? 10 : 20; } } - public override double RequiredSkill{ get{ return Core.ML? 30.0 : 60 ; } } + public override int BaseMana => Core.ML ? 10 : 20; + public override double RequiredSkill => Core.ML? 30.0 : 60 ; - public override TextDefinition AbilityMessage{ get{ return new TextDefinition( 1063095 ); } } // You prepare to focus all of your abilities into your next strike. + public override TextDefinition AbilityMessage => new TextDefinition( 1063095 ); // You prepare to focus all of your abilities into your next strike. public override bool Validate( Mobile from ) { diff --git a/Scripts/Spells/Ninjitsu/KiAttack.cs b/Scripts/Spells/Ninjitsu/KiAttack.cs index 89ab1303d..343cea606 100644 --- a/Scripts/Spells/Ninjitsu/KiAttack.cs +++ b/Scripts/Spells/Ninjitsu/KiAttack.cs @@ -13,10 +13,10 @@ namespace Server.Spells.Ninjitsu { } - public override int BaseMana{ get{ return 25; } } - public override double RequiredSkill{ get{ return 80.0; } } + public override int BaseMana => 25; + public override double RequiredSkill => 80.0; - public override TextDefinition AbilityMessage{ get{ return new TextDefinition( 1063099 ); } } // Your Ki Attack must be complete within 2 seconds for the damage bonus! + public override TextDefinition AbilityMessage => new TextDefinition( 1063099 ); // Your Ki Attack must be complete within 2 seconds for the damage bonus! public override void OnUse( Mobile from ) { diff --git a/Scripts/Spells/Ninjitsu/MirrorImage.cs b/Scripts/Spells/Ninjitsu/MirrorImage.cs index a0ac32ec3..9d774c0bc 100644 --- a/Scripts/Spells/Ninjitsu/MirrorImage.cs +++ b/Scripts/Spells/Ninjitsu/MirrorImage.cs @@ -49,10 +49,10 @@ namespace Server.Spells.Ninjitsu 9002 ); - public override TimeSpan CastDelayBase { get { return TimeSpan.FromSeconds( 1.5 ); } } + public override TimeSpan CastDelayBase => TimeSpan.FromSeconds( 1.5 ); - public override double RequiredSkill{ get{ return Core.ML ? 20.0 : 40.0; } } - public override int RequiredMana{ get{ return 10; } } + public override double RequiredSkill => Core.ML ? 20.0 : 40.0; + public override int RequiredMana => 10; public override bool BlockedByAnimalForm => false; diff --git a/Scripts/Spells/Ninjitsu/NinjaMove.cs b/Scripts/Spells/Ninjitsu/NinjaMove.cs index 3e610cc0e..6df13ee46 100644 --- a/Scripts/Spells/Ninjitsu/NinjaMove.cs +++ b/Scripts/Spells/Ninjitsu/NinjaMove.cs @@ -9,11 +9,11 @@ namespace Server.Spells { public class NinjaMove : SpecialMove { - public override SkillName MoveSkill{ get{ return SkillName.Ninjitsu; } } + public override SkillName MoveSkill => SkillName.Ninjitsu; public override void CheckGain( Mobile m ) { m.CheckSkill( MoveSkill, RequiredSkill - 12.5, RequiredSkill + 37.5 ); //Per five on friday 02/16/07 } } -} \ No newline at end of file +} diff --git a/Scripts/Spells/Ninjitsu/NinjaSpell.cs b/Scripts/Spells/Ninjitsu/NinjaSpell.cs index 3712d7760..a2d37afd7 100644 --- a/Scripts/Spells/Ninjitsu/NinjaSpell.cs +++ b/Scripts/Spells/Ninjitsu/NinjaSpell.cs @@ -12,8 +12,8 @@ namespace Server.Spells.Ninjitsu public abstract double RequiredSkill{ get; } public abstract int RequiredMana{ get; } - public override SkillName CastSkill{ get{ return SkillName.Ninjitsu; } } - public override SkillName DamageSkill{ get{ return SkillName.Ninjitsu; } } + public override SkillName CastSkill => SkillName.Ninjitsu; + public override SkillName DamageSkill => SkillName.Ninjitsu; public override bool RevealOnCast => false; public override bool ClearHandsOnCast => false; @@ -21,9 +21,9 @@ namespace Server.Spells.Ninjitsu public override bool BlocksMovement => false; - //public override int CastDelayBase{ get{ return 1; } } + //public override int CastDelayBase => 1; - public override int CastRecoveryBase{ get{ return 7; } } + public override int CastRecoveryBase => 7; public NinjaSpell( Mobile caster, Item scroll, SpellInfo info ) : base( caster, scroll, info ) { diff --git a/Scripts/Spells/Ninjitsu/ShadowJump.cs b/Scripts/Spells/Ninjitsu/ShadowJump.cs index 6a73c8fe6..23e3ea14c 100644 --- a/Scripts/Spells/Ninjitsu/ShadowJump.cs +++ b/Scripts/Spells/Ninjitsu/ShadowJump.cs @@ -16,10 +16,10 @@ namespace Server.Spells.Ninjitsu 9002 ); - public override TimeSpan CastDelayBase { get { return TimeSpan.FromSeconds( 1.0 ); } } + public override TimeSpan CastDelayBase => TimeSpan.FromSeconds( 1.0 ); - public override double RequiredSkill{ get{ return 50.0; } } - public override int RequiredMana{ get{ return 15; } } + public override double RequiredSkill => 50.0; + public override int RequiredMana => 15; public override bool BlockedByAnimalForm => false; diff --git a/Scripts/Spells/Ninjitsu/SurpriseAttack.cs b/Scripts/Spells/Ninjitsu/SurpriseAttack.cs index 7cf64db8b..9ab3f11c5 100644 --- a/Scripts/Spells/Ninjitsu/SurpriseAttack.cs +++ b/Scripts/Spells/Ninjitsu/SurpriseAttack.cs @@ -14,10 +14,10 @@ namespace Server.Spells.Ninjitsu { } - public override int BaseMana{ get{ return 20; } } - public override double RequiredSkill{ get{ return Core.ML ? 60.0 : 30.0; } } + public override int BaseMana => 20; + public override double RequiredSkill => Core.ML ? 60.0 : 30.0; - public override TextDefinition AbilityMessage{ get{ return new TextDefinition( 1063128 ); } } // You prepare to surprise your prey. + public override TextDefinition AbilityMessage => new TextDefinition( 1063128 ); // You prepare to surprise your prey. public override bool Validate( Mobile from ) { diff --git a/Scripts/Spells/Second/Agility.cs b/Scripts/Spells/Second/Agility.cs index dade685c3..6cc4b7220 100644 --- a/Scripts/Spells/Second/Agility.cs +++ b/Scripts/Spells/Second/Agility.cs @@ -14,7 +14,7 @@ namespace Server.Spells.Second Reagent.MandrakeRoot ); - public override SpellCircle Circle { get { return SpellCircle.Second; } } + public override SpellCircle Circle => SpellCircle.Second; public AgilitySpell( Mobile caster, Item scroll ) : base( caster, scroll, m_Info ) { @@ -67,7 +67,7 @@ namespace Server.Spells.Second public InternalTarget( AgilitySpell owner ) : base( Core.ML ? 10 : 12, false, TargetFlags.Beneficial ) { m_Owner = owner; - } + } protected override void OnTarget( Mobile from, object o ) { @@ -83,4 +83,4 @@ namespace Server.Spells.Second } } } -} \ No newline at end of file +} diff --git a/Scripts/Spells/Second/Cunning.cs b/Scripts/Spells/Second/Cunning.cs index 42b94078d..c2efde17f 100644 --- a/Scripts/Spells/Second/Cunning.cs +++ b/Scripts/Spells/Second/Cunning.cs @@ -14,7 +14,7 @@ namespace Server.Spells.Second Reagent.Nightshade ); - public override SpellCircle Circle { get { return SpellCircle.Second; } } + public override SpellCircle Circle => SpellCircle.Second; public CunningSpell( Mobile caster, Item scroll ) : base( caster, scroll, m_Info ) { @@ -67,7 +67,7 @@ namespace Server.Spells.Second public InternalTarget( CunningSpell owner ) : base( Core.ML ? 10 : 12, false, TargetFlags.Beneficial ) { m_Owner = owner; - } + } protected override void OnTarget( Mobile from, object o ) { @@ -83,4 +83,4 @@ namespace Server.Spells.Second } } } -} \ No newline at end of file +} diff --git a/Scripts/Spells/Second/Cure.cs b/Scripts/Spells/Second/Cure.cs index 7c3732c68..a3d0d0152 100644 --- a/Scripts/Spells/Second/Cure.cs +++ b/Scripts/Spells/Second/Cure.cs @@ -14,7 +14,7 @@ namespace Server.Spells.Second Reagent.Ginseng ); - public override SpellCircle Circle { get { return SpellCircle.Second; } } + public override SpellCircle Circle => SpellCircle.Second; public CureSpell( Mobile caster, Item scroll ) : base( caster, scroll, m_Info ) { @@ -99,4 +99,4 @@ namespace Server.Spells.Second } } } -} \ No newline at end of file +} diff --git a/Scripts/Spells/Second/Harm.cs b/Scripts/Spells/Second/Harm.cs index 397840f31..fd1b09770 100644 --- a/Scripts/Spells/Second/Harm.cs +++ b/Scripts/Spells/Second/Harm.cs @@ -14,7 +14,7 @@ namespace Server.Spells.Second Reagent.SpidersSilk ); - public override SpellCircle Circle { get { return SpellCircle.Second; } } + public override SpellCircle Circle => SpellCircle.Second; public HarmSpell( Mobile caster, Item scroll ) : base( caster, scroll, m_Info ) { diff --git a/Scripts/Spells/Second/MagicTrap.cs b/Scripts/Spells/Second/MagicTrap.cs index 50fade132..887e51dae 100644 --- a/Scripts/Spells/Second/MagicTrap.cs +++ b/Scripts/Spells/Second/MagicTrap.cs @@ -16,7 +16,7 @@ namespace Server.Spells.Second Reagent.SulfurousAsh ); - public override SpellCircle Circle { get { return SpellCircle.Second; } } + public override SpellCircle Circle => SpellCircle.Second; public MagicTrapSpell( Mobile caster, Item scroll ) : base( caster, scroll, m_Info ) { @@ -86,4 +86,4 @@ namespace Server.Spells.Second } } } -} \ No newline at end of file +} diff --git a/Scripts/Spells/Second/Protection.cs b/Scripts/Spells/Second/Protection.cs index 8e0e99362..fc23f77fc 100644 --- a/Scripts/Spells/Second/Protection.cs +++ b/Scripts/Spells/Second/Protection.cs @@ -8,7 +8,7 @@ namespace Server.Spells.Second public class ProtectionSpell : MagerySpell { private static Hashtable m_Registry = new Hashtable(); - public static Hashtable Registry { get { return m_Registry; } } + public static Hashtable Registry => m_Registry; private static SpellInfo m_Info = new SpellInfo( "Protection", "Uus Sanct", @@ -19,7 +19,7 @@ namespace Server.Spells.Second Reagent.SulfurousAsh ); - public override SpellCircle Circle { get { return SpellCircle.Second; } } + public override SpellCircle Circle => SpellCircle.Second; public ProtectionSpell( Mobile caster, Item scroll ) : base( caster, scroll, m_Info ) { @@ -53,8 +53,8 @@ namespace Server.Spells.Second * a decreased "resisting spells" skill value by -35 + (Inscription/20), * and a slower casting speed modifier (technically, a negative "faster cast speed") of 2 points. * The protection spell has an indefinite duration, becoming active when cast, and deactivated when re-cast. - * Reactive Armor, Protection, and Magic Reflection will stay on—even after logging out, - * even after dying—until you “turn them off” by casting them again. + * Reactive Armor, Protection, and Magic Reflection will stay on�even after logging out, + * even after dying�until you �turn them off� by casting them again. */ object[] mods = (object[])m_Table[target]; diff --git a/Scripts/Spells/Second/RemoveTrap.cs b/Scripts/Spells/Second/RemoveTrap.cs index 3862739d0..ae1929ec6 100644 --- a/Scripts/Spells/Second/RemoveTrap.cs +++ b/Scripts/Spells/Second/RemoveTrap.cs @@ -15,7 +15,7 @@ namespace Server.Spells.Second Reagent.SulfurousAsh ); - public override SpellCircle Circle { get { return SpellCircle.Second; } } + public override SpellCircle Circle => SpellCircle.Second; public RemoveTrapSpell( Mobile caster, Item scroll ) : base( caster, scroll, m_Info ) { @@ -81,4 +81,4 @@ namespace Server.Spells.Second } } } -} \ No newline at end of file +} diff --git a/Scripts/Spells/Second/Strength.cs b/Scripts/Spells/Second/Strength.cs index 70e63b307..1076a0de5 100644 --- a/Scripts/Spells/Second/Strength.cs +++ b/Scripts/Spells/Second/Strength.cs @@ -14,7 +14,7 @@ namespace Server.Spells.Second Reagent.Nightshade ); - public override SpellCircle Circle { get { return SpellCircle.Second; } } + public override SpellCircle Circle => SpellCircle.Second; public StrengthSpell( Mobile caster, Item scroll ) : base( caster, scroll, m_Info ) { @@ -67,7 +67,7 @@ namespace Server.Spells.Second public InternalTarget( StrengthSpell owner ) : base( Core.ML ? 10 : 12, false, TargetFlags.Beneficial ) { m_Owner = owner; - } + } protected override void OnTarget( Mobile from, object o ) { @@ -83,4 +83,4 @@ namespace Server.Spells.Second } } } -} \ No newline at end of file +} diff --git a/Scripts/Spells/Seventh/ChainLightning.cs b/Scripts/Spells/Seventh/ChainLightning.cs index 496028222..6a794a7dc 100644 --- a/Scripts/Spells/Seventh/ChainLightning.cs +++ b/Scripts/Spells/Seventh/ChainLightning.cs @@ -19,7 +19,7 @@ namespace Server.Spells.Seventh Reagent.SulfurousAsh ); - public override SpellCircle Circle { get { return SpellCircle.Seventh; } } + public override SpellCircle Circle => SpellCircle.Seventh; public ChainLightningSpell( Mobile caster, Item scroll ) : base( caster, scroll, m_Info ) { diff --git a/Scripts/Spells/Seventh/EnergyField.cs b/Scripts/Spells/Seventh/EnergyField.cs index e538dcf03..a0041a5b6 100644 --- a/Scripts/Spells/Seventh/EnergyField.cs +++ b/Scripts/Spells/Seventh/EnergyField.cs @@ -20,7 +20,7 @@ namespace Server.Spells.Seventh Reagent.SulfurousAsh ); - public override SpellCircle Circle { get { return SpellCircle.Seventh; } } + public override SpellCircle Circle => SpellCircle.Seventh; public EnergyFieldSpell( Mobile caster, Item scroll ) : base( caster, scroll, m_Info ) { diff --git a/Scripts/Spells/Seventh/FlameStrike.cs b/Scripts/Spells/Seventh/FlameStrike.cs index c8e0c7b73..65fdd8ceb 100644 --- a/Scripts/Spells/Seventh/FlameStrike.cs +++ b/Scripts/Spells/Seventh/FlameStrike.cs @@ -14,7 +14,7 @@ namespace Server.Spells.Seventh Reagent.SulfurousAsh ); - public override SpellCircle Circle { get { return SpellCircle.Seventh; } } + public override SpellCircle Circle => SpellCircle.Seventh; public FlameStrikeSpell( Mobile caster, Item scroll ) : base( caster, scroll, m_Info ) { diff --git a/Scripts/Spells/Seventh/GateTravel.cs b/Scripts/Spells/Seventh/GateTravel.cs index 3eacd7622..4fab421c1 100644 --- a/Scripts/Spells/Seventh/GateTravel.cs +++ b/Scripts/Spells/Seventh/GateTravel.cs @@ -20,7 +20,7 @@ namespace Server.Spells.Seventh Reagent.SulfurousAsh ); - public override SpellCircle Circle { get { return SpellCircle.Seventh; } } + public override SpellCircle Circle => SpellCircle.Seventh; private RunebookEntry m_Entry; diff --git a/Scripts/Spells/Seventh/ManaVampire.cs b/Scripts/Spells/Seventh/ManaVampire.cs index 721fdea00..9718b1067 100644 --- a/Scripts/Spells/Seventh/ManaVampire.cs +++ b/Scripts/Spells/Seventh/ManaVampire.cs @@ -16,7 +16,7 @@ namespace Server.Spells.Seventh Reagent.SpidersSilk ); - public override SpellCircle Circle { get { return SpellCircle.Seventh; } } + public override SpellCircle Circle => SpellCircle.Seventh; public ManaVampireSpell( Mobile caster, Item scroll ) : base( caster, scroll, m_Info ) { @@ -119,4 +119,4 @@ namespace Server.Spells.Seventh } } } -} \ No newline at end of file +} diff --git a/Scripts/Spells/Seventh/MassDispel.cs b/Scripts/Spells/Seventh/MassDispel.cs index 14a572585..82412f52e 100644 --- a/Scripts/Spells/Seventh/MassDispel.cs +++ b/Scripts/Spells/Seventh/MassDispel.cs @@ -20,7 +20,7 @@ namespace Server.Spells.Seventh Reagent.SulfurousAsh ); - public override SpellCircle Circle { get { return SpellCircle.Seventh; } } + public override SpellCircle Circle => SpellCircle.Seventh; public MassDispelSpell( Mobile caster, Item scroll ) : base( caster, scroll, m_Info ) { diff --git a/Scripts/Spells/Seventh/MeteorSwarm.cs b/Scripts/Spells/Seventh/MeteorSwarm.cs index 2c3aefd50..5ef5499e8 100644 --- a/Scripts/Spells/Seventh/MeteorSwarm.cs +++ b/Scripts/Spells/Seventh/MeteorSwarm.cs @@ -19,7 +19,7 @@ namespace Server.Spells.Seventh Reagent.SpidersSilk ); - public override SpellCircle Circle { get { return SpellCircle.Seventh; } } + public override SpellCircle Circle => SpellCircle.Seventh; public MeteorSwarmSpell( Mobile caster, Item scroll ) : base( caster, scroll, m_Info ) { diff --git a/Scripts/Spells/Seventh/Polymorph.cs b/Scripts/Spells/Seventh/Polymorph.cs index 4ed0dc759..66260bca7 100644 --- a/Scripts/Spells/Seventh/Polymorph.cs +++ b/Scripts/Spells/Seventh/Polymorph.cs @@ -19,7 +19,7 @@ namespace Server.Spells.Seventh Reagent.MandrakeRoot ); - public override SpellCircle Circle { get { return SpellCircle.Seventh; } } + public override SpellCircle Circle => SpellCircle.Seventh; private int m_NewBody; @@ -64,7 +64,7 @@ namespace Server.Spells.Seventh { if( Core.ML ) EndPolymorph( Caster ); - else + else Caster.SendLocalizedMessage( 1005559 ); // This spell is already in effect. return false; } @@ -88,7 +88,7 @@ namespace Server.Spells.Seventh /*if ( Caster.Mounted ) { Caster.SendLocalizedMessage( 1042561 ); //Please dismount first. - } + } else */ if ( Factions.Sigil.ExistsOn( Caster ) ) { diff --git a/Scripts/Spells/Sixth/Dispel.cs b/Scripts/Spells/Sixth/Dispel.cs index ee0f33c1a..f836fbb44 100644 --- a/Scripts/Spells/Sixth/Dispel.cs +++ b/Scripts/Spells/Sixth/Dispel.cs @@ -18,7 +18,7 @@ namespace Server.Spells.Sixth Reagent.SulfurousAsh ); - public override SpellCircle Circle { get { return SpellCircle.Sixth; } } + public override SpellCircle Circle => SpellCircle.Sixth; public DispelSpell( Mobile caster, Item scroll ) : base( caster, scroll, m_Info ) { @@ -81,4 +81,4 @@ namespace Server.Spells.Sixth } } } -} \ No newline at end of file +} diff --git a/Scripts/Spells/Sixth/EnergyBolt.cs b/Scripts/Spells/Sixth/EnergyBolt.cs index 958b69aad..2f4c86b4d 100644 --- a/Scripts/Spells/Sixth/EnergyBolt.cs +++ b/Scripts/Spells/Sixth/EnergyBolt.cs @@ -14,7 +14,7 @@ namespace Server.Spells.Sixth Reagent.Nightshade ); - public override SpellCircle Circle { get { return SpellCircle.Sixth; } } + public override SpellCircle Circle => SpellCircle.Sixth; public EnergyBoltSpell( Mobile caster, Item scroll ) : base( caster, scroll, m_Info ) { diff --git a/Scripts/Spells/Sixth/Explosion.cs b/Scripts/Spells/Sixth/Explosion.cs index 3e0903147..7db825b97 100644 --- a/Scripts/Spells/Sixth/Explosion.cs +++ b/Scripts/Spells/Sixth/Explosion.cs @@ -14,14 +14,14 @@ namespace Server.Spells.Sixth Reagent.MandrakeRoot ); - public override SpellCircle Circle { get { return SpellCircle.Sixth; } } + public override SpellCircle Circle => SpellCircle.Sixth; public ExplosionSpell( Mobile caster, Item scroll ) : base( caster, scroll, m_Info ) { } - public override bool DelayedDamageStacking { get { return !Core.AOS; } } + public override bool DelayedDamageStacking => !Core.AOS; public override void OnCast() { diff --git a/Scripts/Spells/Sixth/Invisibility.cs b/Scripts/Spells/Sixth/Invisibility.cs index 5854d1583..773621258 100644 --- a/Scripts/Spells/Sixth/Invisibility.cs +++ b/Scripts/Spells/Sixth/Invisibility.cs @@ -16,7 +16,7 @@ namespace Server.Spells.Sixth Reagent.Nightshade ); - public override SpellCircle Circle { get { return SpellCircle.Sixth; } } + public override SpellCircle Circle => SpellCircle.Sixth; public InvisibilitySpell( Mobile caster, Item scroll ) : base( caster, scroll, m_Info ) { @@ -85,8 +85,7 @@ namespace Server.Spells.Sixth public static void RemoveTimer( Mobile m ) { - Timer t = null; - m_Table.TryGetValue(m, out t); + m_Table.TryGetValue( m, out Timer t ); if ( t != null ) { @@ -135,4 +134,4 @@ namespace Server.Spells.Sixth } } } -} \ No newline at end of file +} diff --git a/Scripts/Spells/Sixth/Mark.cs b/Scripts/Spells/Sixth/Mark.cs index ec70f341c..b8971b424 100644 --- a/Scripts/Spells/Sixth/Mark.cs +++ b/Scripts/Spells/Sixth/Mark.cs @@ -17,7 +17,7 @@ namespace Server.Spells.Sixth Reagent.MandrakeRoot ); - public override SpellCircle Circle { get { return SpellCircle.Sixth; } } + public override SpellCircle Circle => SpellCircle.Sixth; public MarkSpell( Mobile caster, Item scroll ) : base( caster, scroll, m_Info ) { @@ -91,4 +91,4 @@ namespace Server.Spells.Sixth } } } -} \ No newline at end of file +} diff --git a/Scripts/Spells/Sixth/MassCurse.cs b/Scripts/Spells/Sixth/MassCurse.cs index 3eb47876e..de562ee8f 100644 --- a/Scripts/Spells/Sixth/MassCurse.cs +++ b/Scripts/Spells/Sixth/MassCurse.cs @@ -20,7 +20,7 @@ namespace Server.Spells.Sixth Reagent.SulfurousAsh ); - public override SpellCircle Circle { get { return SpellCircle.Sixth; } } + public override SpellCircle Circle => SpellCircle.Sixth; public MassCurseSpell( Mobile caster, Item scroll ) : base( caster, scroll, m_Info ) { @@ -75,7 +75,7 @@ namespace Server.Spells.Sixth m.FixedParticles( 0x374A, 10, 15, 5028, EffectLayer.Waist ); m.PlaySound( 0x1FB ); - + HarmfulSpell( m ); } } diff --git a/Scripts/Spells/Sixth/ParalyzeField.cs b/Scripts/Spells/Sixth/ParalyzeField.cs index db822942a..a8583416f 100644 --- a/Scripts/Spells/Sixth/ParalyzeField.cs +++ b/Scripts/Spells/Sixth/ParalyzeField.cs @@ -19,7 +19,7 @@ namespace Server.Spells.Sixth Reagent.SpidersSilk ); - public override SpellCircle Circle { get { return SpellCircle.Sixth; } } + public override SpellCircle Circle => SpellCircle.Sixth; public ParalyzeFieldSpell( Mobile caster, Item scroll ) : base( caster, scroll, m_Info ) { diff --git a/Scripts/Spells/Sixth/Reveal.cs b/Scripts/Spells/Sixth/Reveal.cs index e93ccd7cd..cf365e396 100644 --- a/Scripts/Spells/Sixth/Reveal.cs +++ b/Scripts/Spells/Sixth/Reveal.cs @@ -17,7 +17,7 @@ namespace Server.Spells.Sixth Reagent.SulfurousAsh ); - public override SpellCircle Circle { get { return SpellCircle.Sixth; } } + public override SpellCircle Circle => SpellCircle.Sixth; public RevealSpell( Mobile caster, Item scroll ) : base( caster, scroll, m_Info ) { @@ -74,10 +74,10 @@ namespace Server.Spells.Sixth FinishSequence(); } - // Reveal uses magery and detect hidden vs. hide and stealth + // Reveal uses magery and detect hidden vs. hide and stealth private static bool CheckDifficulty( Mobile from, Mobile m ) { - // Reveal always reveals vs. invisibility spell + // Reveal always reveals vs. invisibility spell if ( !Core.AOS || InvisibilitySpell.HasTimer( m ) ) return true; diff --git a/Scripts/Spells/Spellweaving/ArcaneCircle.cs b/Scripts/Spells/Spellweaving/ArcaneCircle.cs index b948d2bf9..38fbb516a 100644 --- a/Scripts/Spells/Spellweaving/ArcaneCircle.cs +++ b/Scripts/Spells/Spellweaving/ArcaneCircle.cs @@ -12,10 +12,10 @@ namespace Server.Spells.Spellweaving -1 ); - public override TimeSpan CastDelayBase { get { return TimeSpan.FromSeconds( 0.5 ); } } + public override TimeSpan CastDelayBase => TimeSpan.FromSeconds( 0.5 ); - public override double RequiredSkill { get { return 0.0; } } - public override int RequiredMana { get { return 24; } } + public override double RequiredSkill => 0.0; + public override int RequiredMana => 24; public ArcaneCircleSpell( Mobile caster, Item scroll ) : base( caster, scroll, m_Info ) @@ -66,7 +66,7 @@ namespace Server.Spells.Spellweaving private static bool IsValidLocation( Point3D location, Map map ) { - LandTile lt = map.Tiles.GetLandTile( location.X, location.Y ); // Land Tiles + LandTile lt = map.Tiles.GetLandTile( location.X, location.Y ); // Land Tiles if( IsValidTile( lt.ID ) && lt.Z == location.Z ) return true; @@ -91,7 +91,7 @@ namespace Server.Spells.Spellweaving foreach( Item item in eable ) { ItemData id = item.ItemData; - + if( item == null || item.Z + id.CalcHeight != location.Z ) continue; else if( IsValidTile( item.ItemID ) ) diff --git a/Scripts/Spells/Spellweaving/ArcaneForm.cs b/Scripts/Spells/Spellweaving/ArcaneForm.cs index 288c1d218..b3ba5c3a2 100644 --- a/Scripts/Spells/Spellweaving/ArcaneForm.cs +++ b/Scripts/Spells/Spellweaving/ArcaneForm.cs @@ -13,13 +13,13 @@ namespace Server.Spells.Spellweaving public abstract class ArcaneForm : ArcanistSpell, ITransformationSpell { public abstract int Body { get; } - public virtual int Hue { get { return 0; } } + public virtual int Hue => 0; - public virtual int PhysResistOffset { get { return 0; } } - public virtual int FireResistOffset { get { return 0; } } - public virtual int ColdResistOffset { get { return 0; } } - public virtual int PoisResistOffset { get { return 0; } } - public virtual int NrgyResistOffset { get { return 0; } } + public virtual int PhysResistOffset => 0; + public virtual int FireResistOffset => 0; + public virtual int ColdResistOffset => 0; + public virtual int PoisResistOffset => 0; + public virtual int NrgyResistOffset => 0; public ArcaneForm( Mobile caster, Item scroll, SpellInfo info ) : base( caster, scroll, info ) { @@ -57,4 +57,4 @@ namespace Server.Spells.Spellweaving { } } -} \ No newline at end of file +} diff --git a/Scripts/Spells/Spellweaving/ArcanistSpell.cs b/Scripts/Spells/Spellweaving/ArcanistSpell.cs index a3a4c1a78..89bf203bf 100644 --- a/Scripts/Spells/Spellweaving/ArcanistSpell.cs +++ b/Scripts/Spells/Spellweaving/ArcanistSpell.cs @@ -11,8 +11,8 @@ namespace Server.Spells.Spellweaving public abstract double RequiredSkill { get; } public abstract int RequiredMana { get; } - public override SkillName CastSkill { get { return SkillName.Spellweaving; } } - public override SkillName DamageSkill { get { return SkillName.Spellweaving; } } + public override SkillName CastSkill => SkillName.Spellweaving; + public override SkillName DamageSkill => SkillName.Spellweaving; public override bool ClearHandsOnCast => false; diff --git a/Scripts/Spells/Spellweaving/AttuneWeapon.cs b/Scripts/Spells/Spellweaving/AttuneWeapon.cs index 2b2cc9eeb..16acb1f58 100644 --- a/Scripts/Spells/Spellweaving/AttuneWeapon.cs +++ b/Scripts/Spells/Spellweaving/AttuneWeapon.cs @@ -11,10 +11,10 @@ namespace Server.Spells.Spellweaving -1 ); - public override TimeSpan CastDelayBase { get { return TimeSpan.FromSeconds( 1.0 ); } } + public override TimeSpan CastDelayBase => TimeSpan.FromSeconds( 1.0 ); - public override double RequiredSkill { get { return 0.0; } } - public override int RequiredMana { get { return 24; } } + public override double RequiredSkill => 0.0; + public override int RequiredMana => 24; public AttuneWeaponSpell( Mobile caster, Item scroll ) : base( caster, scroll, m_Info ) @@ -90,8 +90,7 @@ namespace Server.Spells.Spellweaving public static void StopAbsorbing( Mobile m, bool message ) { - ExpireTimer t; - if( m_Table.TryGetValue( m, out t ) ) + if (m_Table.TryGetValue( m, out ExpireTimer t )) { t.DoExpire( message ); } @@ -131,4 +130,4 @@ namespace Server.Spells.Spellweaving } } } -} \ No newline at end of file +} diff --git a/Scripts/Spells/Spellweaving/EssenceOfWind.cs b/Scripts/Spells/Spellweaving/EssenceOfWind.cs index feb3aa14e..304a60393 100644 --- a/Scripts/Spells/Spellweaving/EssenceOfWind.cs +++ b/Scripts/Spells/Spellweaving/EssenceOfWind.cs @@ -8,10 +8,10 @@ namespace Server.Spells.Spellweaving { private static SpellInfo m_Info = new SpellInfo( "Essence of Wind", "Anathrae", -1 ); - public override TimeSpan CastDelayBase { get { return TimeSpan.FromSeconds( 3.0 ); } } + public override TimeSpan CastDelayBase => TimeSpan.FromSeconds( 3.0 ); - public override double RequiredSkill { get { return 52.0; } } - public override int RequiredMana { get { return 40; } } + public override double RequiredSkill => 52.0; + public override int RequiredMana => 40; public EssenceOfWindSpell( Mobile caster, Item scroll ) : base( caster, scroll, m_Info ) { @@ -70,10 +70,10 @@ namespace Server.Spells.Spellweaving private int m_SSIMalus; private ExpireTimer m_Timer; - public Mobile Defender { get { return m_Defender; } } - public int FCMalus { get { return m_FCMalus; } } - public int SSIMalus { get { return m_SSIMalus; } } - public ExpireTimer Timer { get { return m_Timer; } } + public Mobile Defender => m_Defender; + public int FCMalus => m_FCMalus; + public int SSIMalus => m_SSIMalus; + public ExpireTimer Timer => m_Timer; public EssenceOfWindInfo( Mobile defender, int fcMalus, int ssiMalus, TimeSpan duration ) { @@ -88,9 +88,7 @@ namespace Server.Spells.Spellweaving public static int GetFCMalus( Mobile m ) { - EssenceOfWindInfo info; - - if( m_Table.TryGetValue( m, out info ) ) + if (m_Table.TryGetValue( m, out EssenceOfWindInfo info )) return info.FCMalus; return 0; @@ -98,9 +96,7 @@ namespace Server.Spells.Spellweaving public static int GetSSIMalus( Mobile m ) { - EssenceOfWindInfo info; - - if( m_Table.TryGetValue( m, out info ) ) + if (m_Table.TryGetValue( m, out EssenceOfWindInfo info )) return info.SSIMalus; return 0; @@ -113,9 +109,7 @@ namespace Server.Spells.Spellweaving public static void StopDebuffing( Mobile m, bool message ) { - EssenceOfWindInfo info; - - if( m_Table.TryGetValue( m, out info ) ) + if (m_Table.TryGetValue( m, out EssenceOfWindInfo info )) info.Timer.DoExpire( message ); } @@ -147,4 +141,4 @@ namespace Server.Spells.Spellweaving } } } -} \ No newline at end of file +} diff --git a/Scripts/Spells/Spellweaving/EtherealVoyage.cs b/Scripts/Spells/Spellweaving/EtherealVoyage.cs index 24821a81b..1ac0b18a1 100644 --- a/Scripts/Spells/Spellweaving/EtherealVoyage.cs +++ b/Scripts/Spells/Spellweaving/EtherealVoyage.cs @@ -9,13 +9,13 @@ namespace Server.Spells.Spellweaving -1 ); - public override TimeSpan CastDelayBase { get { return TimeSpan.FromSeconds( 3.5 ); } } + public override TimeSpan CastDelayBase => TimeSpan.FromSeconds( 3.5 ); - public override double RequiredSkill { get { return 24.0; } } - public override int RequiredMana { get { return 32; } } + public override double RequiredSkill => 24.0; + public override int RequiredMana => 32; - public override int Body { get { return 0x302; } } - public override int Hue { get { return 0x48F; } } + public override int Body => 0x302; + public override int Hue => 0x48F; public EtherealVoyageSpell( Mobile caster, Item scroll ) : base( caster, scroll, m_Info ) @@ -85,4 +85,4 @@ namespace Server.Spells.Spellweaving BuffInfo.RemoveBuff( m, BuffIcon.EtherealVoyage ); } } -} \ No newline at end of file +} diff --git a/Scripts/Spells/Spellweaving/GiftOfLife.cs b/Scripts/Spells/Spellweaving/GiftOfLife.cs index 1e2e0af24..3302c3314 100644 --- a/Scripts/Spells/Spellweaving/GiftOfLife.cs +++ b/Scripts/Spells/Spellweaving/GiftOfLife.cs @@ -14,10 +14,10 @@ namespace Server.Spells.Spellweaving -1 ); - public override TimeSpan CastDelayBase { get { return TimeSpan.FromSeconds( 4.0 ); } } + public override TimeSpan CastDelayBase => TimeSpan.FromSeconds( 4.0 ); - public override double RequiredSkill { get { return 38.0; } } - public override int RequiredMana { get { return 70; } } + public override double RequiredSkill => 38.0; + public override int RequiredMana => 70; public GiftOfLifeSpell( Mobile caster, Item scroll ) : base( caster, scroll, m_Info ) @@ -99,9 +99,7 @@ namespace Server.Spells.Spellweaving private static void HandleDeath_OnCallback( Mobile m ) { - ExpireTimer timer; - - if( m_Table.TryGetValue( m, out timer ) ) + if (m_Table.TryGetValue( m, out ExpireTimer timer )) { double hitsScalar = timer.Spell.HitsScalar; @@ -162,7 +160,7 @@ namespace Server.Spells.Spellweaving private GiftOfLifeSpell m_Spell; - public GiftOfLifeSpell Spell { get { return m_Spell; } } + public GiftOfLifeSpell Spell => m_Spell; public ExpireTimer( Mobile m, TimeSpan delay, GiftOfLifeSpell spell ) : base( delay ) @@ -215,4 +213,4 @@ namespace Server.Spells.Spellweaving } } } -} \ No newline at end of file +} diff --git a/Scripts/Spells/Spellweaving/GiftOfRenewal.cs b/Scripts/Spells/Spellweaving/GiftOfRenewal.cs index 1dad5c961..d5cde8597 100644 --- a/Scripts/Spells/Spellweaving/GiftOfRenewal.cs +++ b/Scripts/Spells/Spellweaving/GiftOfRenewal.cs @@ -12,10 +12,10 @@ namespace Server.Spells.Spellweaving -1 ); - public override TimeSpan CastDelayBase { get { return TimeSpan.FromSeconds( 3.0 ); } } + public override TimeSpan CastDelayBase => TimeSpan.FromSeconds( 3.0 ); - public override double RequiredSkill { get { return 0.0; } } - public override int RequiredMana { get { return 24; } } + public override double RequiredSkill => 0.0; + public override int RequiredMana => 24; public GiftOfRenewalSpell( Mobile caster, Item scroll ) : base( caster, scroll, m_Info ) @@ -143,9 +143,7 @@ namespace Server.Spells.Spellweaving public static bool StopEffect( Mobile m ) { - GiftOfRenewalInfo info; - - if( m_Table.TryGetValue( m, out info ) ) + if (m_Table.TryGetValue( m, out GiftOfRenewalInfo info )) { m_Table.Remove( m ); @@ -184,4 +182,4 @@ namespace Server.Spells.Spellweaving } } } -} \ No newline at end of file +} diff --git a/Scripts/Spells/Spellweaving/ImmolatingWeapon.cs b/Scripts/Spells/Spellweaving/ImmolatingWeapon.cs index 400d564fd..bcc9bc057 100644 --- a/Scripts/Spells/Spellweaving/ImmolatingWeapon.cs +++ b/Scripts/Spells/Spellweaving/ImmolatingWeapon.cs @@ -12,10 +12,10 @@ namespace Server.Spells.Spellweaving -1 ); - public override TimeSpan CastDelayBase { get { return TimeSpan.FromSeconds( 1.0 ); } } + public override TimeSpan CastDelayBase => TimeSpan.FromSeconds( 1.0 ); - public override double RequiredSkill { get { return 10.0; } } - public override int RequiredMana { get { return 32; } } + public override double RequiredSkill => 10.0; + public override int RequiredMana => 32; public ImmolatingWeaponSpell( Mobile caster, Item scroll ) : base( caster, scroll, m_Info ) @@ -74,9 +74,7 @@ namespace Server.Spells.Spellweaving public static int GetImmolatingDamage( BaseWeapon weapon ) { - ImmolatingWeaponEntry entry; - - if ( m_WeaponDamageTable.TryGetValue( weapon, out entry ) ) + if (m_WeaponDamageTable.TryGetValue( weapon, out ImmolatingWeaponEntry entry )) return entry.m_Damage; return 0; @@ -89,17 +87,13 @@ namespace Server.Spells.Spellweaving private static void FinishEffect( DelayedEffectEntry effect ) { - ImmolatingWeaponEntry entry; - - if ( m_WeaponDamageTable.TryGetValue( effect.m_Weapon, out entry ) ) + if (m_WeaponDamageTable.TryGetValue( effect.m_Weapon, out ImmolatingWeaponEntry entry )) AOS.Damage( effect.m_Target, entry.m_Caster, entry.m_Damage, 0, 100, 0, 0, 0 ); } public static void StopImmolating( BaseWeapon weapon ) { - ImmolatingWeaponEntry entry; - - if ( m_WeaponDamageTable.TryGetValue( weapon, out entry ) ) + if (m_WeaponDamageTable.TryGetValue( weapon, out ImmolatingWeaponEntry entry )) { if ( entry.m_Caster != null ) entry.m_Caster.PlaySound( 0x27 ); diff --git a/Scripts/Spells/Spellweaving/Items/ArcaneFocus.cs b/Scripts/Spells/Spellweaving/Items/ArcaneFocus.cs index 59271eb24..6bcad31fb 100644 --- a/Scripts/Spells/Spellweaving/Items/ArcaneFocus.cs +++ b/Scripts/Spells/Spellweaving/Items/ArcaneFocus.cs @@ -5,7 +5,7 @@ namespace Server.Items { public class ArcaneFocus : TransientItem { - public override int LabelNumber { get { return 1032629; } } // Arcane Focus + public override int LabelNumber => 1032629; // Arcane Focus private int m_StrengthBonus; @@ -45,7 +45,7 @@ namespace Server.Items list.Add( 1060485, m_StrengthBonus.ToString() ); // strength bonus ~1_val~ } - public override TextDefinition InvalidTransferMessage{ get { return 1073480; } } // Your arcane focus disappears. + public override TextDefinition InvalidTransferMessage => 1073480; // Your arcane focus disappears. public override bool Nontransferable => true; public override void Serialize( GenericWriter writer ) diff --git a/Scripts/Spells/Spellweaving/Items/TransientItem.cs b/Scripts/Spells/Spellweaving/Items/TransientItem.cs index 784385c48..05f6ab17f 100644 --- a/Scripts/Spells/Spellweaving/Items/TransientItem.cs +++ b/Scripts/Spells/Spellweaving/Items/TransientItem.cs @@ -36,7 +36,7 @@ namespace Server.Items this.Delete(); } - public virtual TextDefinition InvalidTransferMessage { get { return null; } } + public virtual TextDefinition InvalidTransferMessage => null; public virtual void Expire( Mobile parent ) diff --git a/Scripts/Spells/Spellweaving/Mobiles/ArcaneFey.cs b/Scripts/Spells/Spellweaving/Mobiles/ArcaneFey.cs index 7b658f421..b32918beb 100644 --- a/Scripts/Spells/Spellweaving/Mobiles/ArcaneFey.cs +++ b/Scripts/Spells/Spellweaving/Mobiles/ArcaneFey.cs @@ -7,10 +7,10 @@ namespace Server.Mobiles [CorpseName( "a pixie corpse" )] public class ArcaneFey : BaseCreature { - public override double DispelDifficulty { get { return 70.0; } } - public override double DispelFocus { get { return 20.0; } } + public override double DispelDifficulty => 70.0; + public override double DispelFocus => 20.0; - public override OppositionGroup OppositionGroup { get { return OppositionGroup.FeyAndUndead; } } + public override OppositionGroup OppositionGroup => OppositionGroup.FeyAndUndead; public override bool InitialInnocent => true; [Constructible] diff --git a/Scripts/Spells/Spellweaving/Mobiles/ArcaneFiend.cs b/Scripts/Spells/Spellweaving/Mobiles/ArcaneFiend.cs index 01086f6c2..8047926a8 100644 --- a/Scripts/Spells/Spellweaving/Mobiles/ArcaneFiend.cs +++ b/Scripts/Spells/Spellweaving/Mobiles/ArcaneFiend.cs @@ -7,10 +7,10 @@ namespace Server.Mobiles [CorpseName( "an imp corpse" )] public class ArcaneFiend : BaseCreature { - public override double DispelDifficulty { get { return 70.0; } } - public override double DispelFocus { get { return 20.0; } } + public override double DispelDifficulty => 70.0; + public override double DispelFocus => 20.0; - public override PackInstinct PackInstinct { get { return PackInstinct.Daemon; } } + public override PackInstinct PackInstinct => PackInstinct.Daemon; public override bool BleedImmune => true; //TODO: Verify on OSI. Guide says this. public override string DefaultName => "an imp"; diff --git a/Scripts/Spells/Spellweaving/Mobiles/NatureFury.cs b/Scripts/Spells/Spellweaving/Mobiles/NatureFury.cs index 6ffb663be..07d4d75f2 100644 --- a/Scripts/Spells/Spellweaving/Mobiles/NatureFury.cs +++ b/Scripts/Spells/Spellweaving/Mobiles/NatureFury.cs @@ -6,14 +6,14 @@ namespace Server.Mobiles { public class NatureFury : BaseCreature { - public override bool DeleteCorpseOnDeath { get { return Core.AOS; } } + public override bool DeleteCorpseOnDeath => Core.AOS; public override bool IsHouseSummonable => true; - public override double DispelDifficulty { get { return 125.0; } } - public override double DispelFocus { get { return 90.0; } } + public override double DispelDifficulty => 125.0; + public override double DispelFocus => 90.0; public override bool BleedImmune => true; - public override Poison PoisonImmune { get { return Poison.Lethal; } } + public override Poison PoisonImmune => Poison.Lethal; public override bool AlwaysMurderer => true; public override string DefaultName => "a nature's fury"; diff --git a/Scripts/Spells/Spellweaving/NatureFury.cs b/Scripts/Spells/Spellweaving/NatureFury.cs index 93ca3af86..b8841f431 100644 --- a/Scripts/Spells/Spellweaving/NatureFury.cs +++ b/Scripts/Spells/Spellweaving/NatureFury.cs @@ -13,10 +13,10 @@ namespace Server.Spells.Spellweaving false ); - public override TimeSpan CastDelayBase { get { return TimeSpan.FromSeconds( 1.5 ); } } + public override TimeSpan CastDelayBase => TimeSpan.FromSeconds( 1.5 ); - public override double RequiredSkill { get { return 0.0; } } - public override int RequiredMana { get { return 24; } } + public override double RequiredSkill => 0.0; + public override int RequiredMana => 24; public NatureFurySpell( Mobile caster, Item scroll ) : base( caster, scroll, m_Info ) @@ -119,4 +119,4 @@ namespace Server.Spells.Spellweaving } } } -} \ No newline at end of file +} diff --git a/Scripts/Spells/Spellweaving/ReaperForm.cs b/Scripts/Spells/Spellweaving/ReaperForm.cs index 6d4e422ab..7f3531f4e 100644 --- a/Scripts/Spells/Spellweaving/ReaperForm.cs +++ b/Scripts/Spells/Spellweaving/ReaperForm.cs @@ -7,7 +7,7 @@ namespace Server.Spells.Spellweaving { private static SpellInfo m_Info = new SpellInfo( "Reaper Form", "Tarisstree", -1 ); - public override TimeSpan CastDelayBase { get { return TimeSpan.FromSeconds( 2.5 ); } } + public override TimeSpan CastDelayBase => TimeSpan.FromSeconds( 2.5 ); public static void Initialize() { @@ -22,16 +22,16 @@ namespace Server.Spells.Spellweaving e.Mobile.Send( SpeedControl.WalkSpeed ); } - public override double RequiredSkill { get { return 24.0; } } - public override int RequiredMana { get { return 34; } } + public override double RequiredSkill => 24.0; + public override int RequiredMana => 34; - public override int Body { get { return 0x11D; } } + public override int Body => 0x11D; - public override int FireResistOffset { get { return -25; } } - public override int PhysResistOffset { get { return 5 + FocusLevel; } } - public override int ColdResistOffset { get { return 5 + FocusLevel; } } - public override int PoisResistOffset { get { return 5 + FocusLevel; } } - public override int NrgyResistOffset { get { return 5 + FocusLevel; } } + public override int FireResistOffset => -25; + public override int PhysResistOffset => 5 + FocusLevel; + public override int ColdResistOffset => 5 + FocusLevel; + public override int PoisResistOffset => 5 + FocusLevel; + public override int NrgyResistOffset => 5 + FocusLevel; public virtual int SwingSpeedBonus { get { return 10 + FocusLevel; } } public virtual int SpellDamageBonus { get { return 10 + FocusLevel; } } @@ -52,4 +52,4 @@ namespace Server.Spells.Spellweaving m.Send( SpeedControl.Disable ); } } -} \ No newline at end of file +} diff --git a/Scripts/Spells/Spellweaving/SummonFey.cs b/Scripts/Spells/Spellweaving/SummonFey.cs index 786b388ab..5dd8ca5a9 100644 --- a/Scripts/Spells/Spellweaving/SummonFey.cs +++ b/Scripts/Spells/Spellweaving/SummonFey.cs @@ -11,17 +11,17 @@ namespace Server.Spells.Spellweaving -1 ); - public override TimeSpan CastDelayBase { get { return TimeSpan.FromSeconds( 1.5 ); } } + public override TimeSpan CastDelayBase => TimeSpan.FromSeconds( 1.5 ); - public override double RequiredSkill { get { return 38.0; } } - public override int RequiredMana { get { return 10; } } + public override double RequiredSkill => 38.0; + public override int RequiredMana => 10; public SummonFeySpell( Mobile caster, Item scroll ) : base( caster, scroll, m_Info ) { } - public override int Sound { get { return 0x217; } } + public override int Sound => 0x217; public override bool CheckSequence() { diff --git a/Scripts/Spells/Spellweaving/SummonFiend.cs b/Scripts/Spells/Spellweaving/SummonFiend.cs index 40b2fe8e3..9a37d9e28 100644 --- a/Scripts/Spells/Spellweaving/SummonFiend.cs +++ b/Scripts/Spells/Spellweaving/SummonFiend.cs @@ -11,17 +11,17 @@ namespace Server.Spells.Spellweaving -1 ); - public override TimeSpan CastDelayBase { get { return TimeSpan.FromSeconds( 2.0 ); } } + public override TimeSpan CastDelayBase => TimeSpan.FromSeconds( 2.0 ); - public override double RequiredSkill { get { return 38.0; } } - public override int RequiredMana { get { return 10; } } + public override double RequiredSkill => 38.0; + public override int RequiredMana => 10; public SummonFiendSpell( Mobile caster, Item scroll ) : base( caster, scroll, m_Info ) { } - public override int Sound { get { return 0x216; } } + public override int Sound => 0x216; public override bool CheckSequence() { diff --git a/Scripts/Spells/Spellweaving/Thunderstorm.cs b/Scripts/Spells/Spellweaving/Thunderstorm.cs index a26bd8635..0fca64d93 100644 --- a/Scripts/Spells/Spellweaving/Thunderstorm.cs +++ b/Scripts/Spells/Spellweaving/Thunderstorm.cs @@ -11,10 +11,10 @@ namespace Server.Spells.Spellweaving -1 ); - public override TimeSpan CastDelayBase { get { return TimeSpan.FromSeconds( 1.5 ); } } + public override TimeSpan CastDelayBase => TimeSpan.FromSeconds( 1.5 ); - public override double RequiredSkill { get { return 10.0; } } - public override int RequiredMana { get { return 32; } } + public override double RequiredSkill => 10.0; + public override int RequiredMana => 32; public ThunderstormSpell( Mobile caster, Item scroll ) : base( caster, scroll, m_Info ) @@ -32,13 +32,13 @@ namespace Server.Spells.Spellweaving int damage = Math.Max( 11, 10 + (int)(skill / 24) ) + FocusLevel; int sdiBonus = AosAttributes.GetValue( Caster, AosAttribute.SpellDamage ); - + int pvmDamage = damage * ( 100 + sdiBonus ); pvmDamage /= 100; if ( sdiBonus > 15 ) sdiBonus = 15; - + int pvpDamage = damage * ( 100 + sdiBonus ); pvpDamage /= 100; @@ -87,9 +87,7 @@ namespace Server.Spells.Spellweaving public static void DoExpire( Mobile m ) { - Timer t; - - if( m_Table.TryGetValue( m, out t ) ) + if (m_Table.TryGetValue( m, out Timer t )) { t.Stop(); m_Table.Remove( m ); @@ -98,4 +96,4 @@ namespace Server.Spells.Spellweaving } } } -} \ No newline at end of file +} diff --git a/Scripts/Spells/Spellweaving/WordOfDeath.cs b/Scripts/Spells/Spellweaving/WordOfDeath.cs index 1380c1951..06fbceff6 100644 --- a/Scripts/Spells/Spellweaving/WordOfDeath.cs +++ b/Scripts/Spells/Spellweaving/WordOfDeath.cs @@ -8,10 +8,10 @@ namespace Server.Spells.Spellweaving { private static SpellInfo m_Info = new SpellInfo( "Word of Death", "Nyraxle", -1 ); - public override TimeSpan CastDelayBase { get { return TimeSpan.FromSeconds( 3.5 ); } } + public override TimeSpan CastDelayBase => TimeSpan.FromSeconds( 3.5 ); - public override double RequiredSkill { get { return 80.0; } } - public override int RequiredMana { get { return 50; } } + public override double RequiredSkill => 80.0; + public override int RequiredMana => 50; public WordOfDeathSpell( Mobile caster, Item scroll ) : base( caster, scroll, m_Info ) { @@ -90,4 +90,4 @@ namespace Server.Spells.Spellweaving } } } -} \ No newline at end of file +} diff --git a/Scripts/Spells/Third/Bless.cs b/Scripts/Spells/Third/Bless.cs index 534eb7430..f017ac0ca 100644 --- a/Scripts/Spells/Third/Bless.cs +++ b/Scripts/Spells/Third/Bless.cs @@ -14,7 +14,7 @@ namespace Server.Spells.Third Reagent.MandrakeRoot ); - public override SpellCircle Circle { get { return SpellCircle.Third; } } + public override SpellCircle Circle => SpellCircle.Third; public BlessSpell( Mobile caster, Item scroll ) : base( caster, scroll, m_Info ) { @@ -87,4 +87,4 @@ namespace Server.Spells.Third } } } -} \ No newline at end of file +} diff --git a/Scripts/Spells/Third/Fireball.cs b/Scripts/Spells/Third/Fireball.cs index dbbf9bc0a..c579ba711 100644 --- a/Scripts/Spells/Third/Fireball.cs +++ b/Scripts/Spells/Third/Fireball.cs @@ -13,7 +13,7 @@ namespace Server.Spells.Third Reagent.BlackPearl ); - public override SpellCircle Circle { get { return SpellCircle.Third; } } + public override SpellCircle Circle => SpellCircle.Third; public FireballSpell( Mobile caster, Item scroll ) : base( caster, scroll, m_Info ) { diff --git a/Scripts/Spells/Third/MagicLock.cs b/Scripts/Spells/Third/MagicLock.cs index 0b40c37ac..9ba1acc16 100644 --- a/Scripts/Spells/Third/MagicLock.cs +++ b/Scripts/Spells/Third/MagicLock.cs @@ -16,7 +16,7 @@ namespace Server.Spells.Third Reagent.SulfurousAsh ); - public override SpellCircle Circle { get { return SpellCircle.Third; } } + public override SpellCircle Circle => SpellCircle.Third; public MagicLockSpell( Mobile caster, Item scroll ) : base( caster, scroll, m_Info ) { @@ -84,4 +84,4 @@ namespace Server.Spells.Third } } } -} \ No newline at end of file +} diff --git a/Scripts/Spells/Third/Poison.cs b/Scripts/Spells/Third/Poison.cs index 184f8408d..6c6c8a29e 100644 --- a/Scripts/Spells/Third/Poison.cs +++ b/Scripts/Spells/Third/Poison.cs @@ -13,7 +13,7 @@ namespace Server.Spells.Third Reagent.Nightshade ); - public override SpellCircle Circle { get { return SpellCircle.Third; } } + public override SpellCircle Circle => SpellCircle.Third; public PoisonSpell( Mobile caster, Item scroll ) : base( caster, scroll, m_Info ) { @@ -144,4 +144,4 @@ namespace Server.Spells.Third } } } -} \ No newline at end of file +} diff --git a/Scripts/Spells/Third/Telekinesis.cs b/Scripts/Spells/Third/Telekinesis.cs index b167e46b9..6f145c117 100644 --- a/Scripts/Spells/Third/Telekinesis.cs +++ b/Scripts/Spells/Third/Telekinesis.cs @@ -16,7 +16,7 @@ namespace Server.Spells.Third Reagent.MandrakeRoot ); - public override SpellCircle Circle { get { return SpellCircle.Third; } } + public override SpellCircle Circle => SpellCircle.Third; public TelekinesisSpell( Mobile caster, Item scroll ) : base( caster, scroll, m_Info ) { @@ -106,4 +106,4 @@ namespace Server { void OnTelekinesis( Mobile from ); } -} \ No newline at end of file +} diff --git a/Scripts/Spells/Third/Teleport.cs b/Scripts/Spells/Third/Teleport.cs index bc4dcbd2b..67fe4e950 100644 --- a/Scripts/Spells/Third/Teleport.cs +++ b/Scripts/Spells/Third/Teleport.cs @@ -16,7 +16,7 @@ namespace Server.Spells.Third Reagent.MandrakeRoot ); - public override SpellCircle Circle { get { return SpellCircle.Third; } } + public override SpellCircle Circle => SpellCircle.Third; public TeleportSpell( Mobile caster, Item scroll ) : base( caster, scroll, m_Info ) { diff --git a/Scripts/Spells/Third/Unlock.cs b/Scripts/Spells/Third/Unlock.cs index 9b50d1892..f50d24074 100644 --- a/Scripts/Spells/Third/Unlock.cs +++ b/Scripts/Spells/Third/Unlock.cs @@ -15,7 +15,7 @@ namespace Server.Spells.Third Reagent.SulfurousAsh ); - public override SpellCircle Circle { get { return SpellCircle.Third; } } + public override SpellCircle Circle => SpellCircle.Third; public UnlockSpell( Mobile caster, Item scroll ) : base( caster, scroll, m_Info ) { @@ -56,7 +56,7 @@ namespace Server.Spells.Third else { LockableContainer cont = (LockableContainer)o; - if ( Multis.BaseHouse.CheckSecured( cont ) ) + if ( Multis.BaseHouse.CheckSecured( cont ) ) from.SendLocalizedMessage( 503098 ); // You cannot cast this on a secure item. else if ( !cont.Locked ) from.LocalOverheadMessage( MessageType.Regular, 0x3B2, 503101 ); // That did not need to be unlocked. @@ -73,7 +73,7 @@ namespace Server.Spells.Third } else from.LocalOverheadMessage( MessageType.Regular, 0x3B2, 503099 ); // My spell does not seem to have an effect on that lock. - } + } } } @@ -86,4 +86,4 @@ namespace Server.Spells.Third } } } -} \ No newline at end of file +} diff --git a/Scripts/Spells/Third/WallOfStone.cs b/Scripts/Spells/Third/WallOfStone.cs index 57b207fa7..d55a1cde0 100644 --- a/Scripts/Spells/Third/WallOfStone.cs +++ b/Scripts/Spells/Third/WallOfStone.cs @@ -18,7 +18,7 @@ namespace Server.Spells.Third Reagent.Garlic ); - public override SpellCircle Circle { get { return SpellCircle.Third; } } + public override SpellCircle Circle => SpellCircle.Third; public WallOfStoneSpell( Mobile caster, Item scroll ) : base( caster, scroll, m_Info ) { diff --git a/Server/Items/VirtualCheck.cs b/Server/Items/VirtualCheck.cs index ee86b5077..a6d324bbc 100644 --- a/Server/Items/VirtualCheck.cs +++ b/Server/Items/VirtualCheck.cs @@ -24,9 +24,9 @@ namespace Server public override bool DisplayWeight => false; public override bool DisplayLootType => false; - public override double DefaultWeight { get { return 0; } } + public override double DefaultWeight => 0; - public override string DefaultName { get { return "Offer Of Currency"; } } + public override string DefaultName => "Offer Of Currency"; public EditGump Editor { get; private set; } diff --git a/Server/Main.cs b/Server/Main.cs index 0babf8c4e..072c6c392 100644 --- a/Server/Main.cs +++ b/Server/Main.cs @@ -107,7 +107,7 @@ namespace Server public static Thread Thread { get { return m_Thread; } } public static MultiTextWriter MultiConsoleOut { get { return m_MultiConOut; } } - /* + /* * DateTime.Now and DateTime.UtcNow are based on actual system clock time. * The resolution is acceptable but large clock jumps are possible and cause issues. * GetTickCount and GetTickCount64 have poor resolution. @@ -151,7 +151,7 @@ namespace Server public static int ProcessorCount { get { return m_ProcessorCount; } } private static bool m_Unix; - + public static bool Unix { get { return m_Unix; } } public static string FindDataFile( string path ) @@ -333,7 +333,7 @@ namespace Server { if( World.Saving || ( m_Service && type == ConsoleEventType.CTRL_LOGOFF_EVENT ) ) return true; - + Kill(); //Kill -> HandleClosed will handle waiting for the completion of flushing to disk return true; @@ -489,18 +489,18 @@ namespace Server while( !ScriptCompiler.Compile( m_Debug, m_Cache ) ) { Console.WriteLine( "Scripts: One or more scripts failed to compile or no script files were found." ); - + if( m_Service ) return; Console.WriteLine( " - Press return to exit, or R to try again." ); - + if( Console.ReadKey( true ).Key != ConsoleKey.R ) return; } ScriptCompiler.Invoke( "Configure" ); - + Region.Load(); World.Load(); @@ -626,7 +626,7 @@ namespace Server } private static readonly Type[] m_SerialTypeArray = { typeof(Serial) }; - + private static void VerifyType(Type t) { var isItem = t.IsSubclassOf(typeof(Item)); @@ -726,7 +726,7 @@ namespace Server new FileStream(FileName, append ? FileMode.Append : FileMode.Create, FileAccess.Write, FileShare.Read))) { writer.WriteLine(">>>Logging started on {0}.", DateTime.UtcNow.ToString("f")); - //f = Tuesday, April 10, 2001 3:51 PM + //f = Tuesday, April 10, 2001 3:51 PM } _NewLine = true; @@ -774,7 +774,7 @@ namespace Server } } - public override Encoding Encoding { get { return Encoding.Default; } } + public override Encoding Encoding => Encoding.Default; } public class MultiTextWriter : TextWriter @@ -822,6 +822,6 @@ namespace Server WriteLine(String.Format(line, args)); } - public override Encoding Encoding { get { return Encoding.Default; } } + public override Encoding Encoding => Encoding.Default; } -} \ No newline at end of file +} diff --git a/Server/Persistence/DualSaveStrategy.cs b/Server/Persistence/DualSaveStrategy.cs index 1cc74e53c..eebc299f3 100644 --- a/Server/Persistence/DualSaveStrategy.cs +++ b/Server/Persistence/DualSaveStrategy.cs @@ -30,14 +30,12 @@ using Server.Guilds; namespace Server { public sealed class DualSaveStrategy : StandardSaveStrategy { - public override string Name { - get { return "Dual"; } - } + public override string Name => "Dual"; public DualSaveStrategy() { } - public override void Save( SaveMetrics metrics, bool permitBackgroundWrite ) + public override void Save( SaveMetrics metrics, bool permitBackgroundWrite ) { this.PermitBackgroundWrite = permitBackgroundWrite; @@ -57,4 +55,4 @@ namespace Server { World.NotifyDiskWriteComplete(); } } -} \ No newline at end of file +} diff --git a/Server/Persistence/DynamicSaveStrategy.cs b/Server/Persistence/DynamicSaveStrategy.cs index 86fd90268..3e58c9bda 100644 --- a/Server/Persistence/DynamicSaveStrategy.cs +++ b/Server/Persistence/DynamicSaveStrategy.cs @@ -36,7 +36,7 @@ namespace Server { public sealed class DynamicSaveStrategy : SaveStrategy { - public override string Name { get { return "Dynamic"; } } + public override string Name => "Dynamic"; private SaveMetrics _metrics; @@ -122,7 +122,7 @@ namespace Server IEnumerable items = World.Items.Values; //Start the producer. - Parallel.ForEach(items, () => new QueuedMemoryWriter(), + Parallel.ForEach(items, () => new QueuedMemoryWriter(), (Item item, ParallelLoopState state, QueuedMemoryWriter writer) => { long startPosition = writer.Position; @@ -152,7 +152,7 @@ namespace Server _itemThreadWriters.Add(writer); }); - _itemThreadWriters.CompleteAdding(); //We only get here after the Parallel.ForEach completes. Lets our task + _itemThreadWriters.CompleteAdding(); //We only get here after the Parallel.ForEach completes. Lets our task return commitTask; } @@ -228,7 +228,7 @@ namespace Server _guildThreadWriters.Add(writer); }); - _guildThreadWriters.CompleteAdding(); //We only get here after the Parallel.ForEach completes. Lets our task + _guildThreadWriters.CompleteAdding(); //We only get here after the Parallel.ForEach completes. Lets our task return commitTask; } @@ -310,4 +310,4 @@ namespace Server } } -} \ No newline at end of file +} diff --git a/Server/Persistence/ParallelSaveStrategy.cs b/Server/Persistence/ParallelSaveStrategy.cs index 07b8f4c35..43a3100a8 100644 --- a/Server/Persistence/ParallelSaveStrategy.cs +++ b/Server/Persistence/ParallelSaveStrategy.cs @@ -31,9 +31,7 @@ using Server.Guilds; namespace Server { public sealed class ParallelSaveStrategy : SaveStrategy { - public override string Name { - get { return "Parallel"; } - } + public override string Name => "Parallel"; private int processorCount; @@ -343,4 +341,4 @@ namespace Server { } } } -} \ No newline at end of file +} diff --git a/Server/Persistence/SequentialFileWriter.cs b/Server/Persistence/SequentialFileWriter.cs index 2c7b5d51a..aea93600c 100644 --- a/Server/Persistence/SequentialFileWriter.cs +++ b/Server/Persistence/SequentialFileWriter.cs @@ -110,21 +110,13 @@ namespace Server { base.Dispose( disposing ); } - public override bool CanRead { - get { return false; } - } + public override bool CanRead => false; - public override bool CanSeek { - get { return false; } - } + public override bool CanSeek => false; - public override bool CanWrite { - get { return true; } - } + public override bool CanWrite => true; - public override long Length { - get { return this.Position; } - } + public override long Length => this.Position; public override int Read( byte[] buffer, int offset, int count ) { throw new InvalidOperationException(); @@ -138,4 +130,4 @@ namespace Server { fileStream.SetLength( value ); } } -} \ No newline at end of file +} diff --git a/Server/Persistence/StandardSaveStrategy.cs b/Server/Persistence/StandardSaveStrategy.cs index d8e8e86b0..1a578c5a9 100644 --- a/Server/Persistence/StandardSaveStrategy.cs +++ b/Server/Persistence/StandardSaveStrategy.cs @@ -38,9 +38,7 @@ namespace Server { public static SaveOption SaveType = SaveOption.Normal; - public override string Name { - get { return "Standard"; } - } + public override string Name => "Standard"; private Queue _decayQueue; private bool _permitBackgroundWrite; @@ -213,4 +211,4 @@ namespace Server { } } } -} \ No newline at end of file +} diff --git a/Server/Random.cs b/Server/Random.cs index a336b9787..5fde128b0 100644 --- a/Server/Random.cs +++ b/Server/Random.cs @@ -38,13 +38,9 @@ namespace Server { } } - public static bool IsHardwareRNG { - get { return _Random is IHardwareRNG; } - } + public static bool IsHardwareRNG => _Random is IHardwareRNG; - public static Type Type { - get { return _Random.GetType(); } - } + public static Type Type => _Random.GetType(); public static int Next(int c) { return _Random.Next(c); @@ -177,7 +173,7 @@ namespace Server { lock (_sync) { CheckSwap(1); return _Working[_Index++]; - } + } } public void NextBytes(byte[] b) { @@ -510,7 +506,7 @@ namespace Server { return; _filled.WaitOne(); - + byte[] b = _Working; _Working = _Buffer; _Buffer = b; @@ -603,4 +599,4 @@ namespace Server { Success = 1, } -} \ No newline at end of file +} diff --git a/Server/TileData.cs b/Server/TileData.cs index ba21c62ec..168a0012a 100644 --- a/Server/TileData.cs +++ b/Server/TileData.cs @@ -221,13 +221,9 @@ namespace Server private static int m_MaxLandValue; private static int m_MaxItemValue; - public static int MaxLandValue { - get { return m_MaxLandValue; } - } + public static int MaxLandValue => m_MaxLandValue; - public static int MaxItemValue { - get { return m_MaxItemValue; } - } + public static int MaxItemValue => m_MaxItemValue; private static byte[] m_StringBuffer = new byte[20]; @@ -369,4 +365,4 @@ namespace Server } } } -} \ No newline at end of file +} diff --git a/Server/World.cs b/Server/World.cs index 70b198fd5..7894c4a0d 100644 --- a/Server/World.cs +++ b/Server/World.cs @@ -73,13 +73,9 @@ namespace Server { m_DiskWriteHandle.WaitOne(); } - public static Dictionary Mobiles { - get { return m_Mobiles; } - } + public static Dictionary Mobiles => m_Mobiles; - public static Dictionary Items { - get { return m_Items; } - } + public static Dictionary Items => m_Items; public static bool OnDelete( IEntity entity ) { if ( m_Saving || m_Loading ) { @@ -276,9 +272,7 @@ namespace Server { private static string m_LoadingType; - public static string LoadingType { - get { return m_LoadingType; } - } + public static string LoadingType => m_LoadingType; private static readonly Type[] m_SerialTypeArray = new Type[1] { typeof(Serial) }; @@ -867,4 +861,4 @@ namespace Server { m_Items.Remove( item.Serial ); } } -} \ No newline at end of file +}