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

Upgrades code style - First batch (#22)

Browse source
This commit is contained in:
Kamron Batman 2018-08-14 06:16:50 +08:00 • committed by GitHub
parent 8ee42c8ea2
commit 632e8b4757
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1834 changed files with 10245 additions and 10437 deletions
Download patch file Download diff file Expand all files Collapse all files

4
Scripts/Accounting/Accounts.cs
View file

@ -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<IAccount> GetAccounts()
{
@ -38,7 +38,7 @@ namespace Server.Accounting
{
m_Accounts[a.Username] = a;
}
public static void Remove( string username )
{
m_Accounts.Remove( username );

54
Scripts/Commands/Docs.cs
View file

@ -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<string> m_Strings;
public int Index { get { return m_Index; } }
public List<string> Strings { get { return m_Strings; } }
public int Index => m_Index;
public List<string> 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<TypeInfo> nspaces = null;
m_Namespaces.TryGetValue( nspace, out nspaces );
m_Namespaces.TryGetValue( nspace, out List<TypeInfo> nspaces );
if( nspaces == null )
m_Namespaces[nspace] = nspaces = new List<TypeInfo>();
@ -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( " <a " );
TypeInfo typeInfo = null;
m_Types.TryGetValue( parms[j].ParameterType, out typeInfo );
m_Types.TryGetValue( parms[j].ParameterType, out TypeInfo typeInfo );
if( typeInfo != null )
html.Write( "href=\"types/{0}\" ", typeInfo.FileName );
@ -2178,8 +2171,7 @@ namespace Server.Commands
typeHtml.Write( '(' );
TypeInfo decInfo = null;
m_Types.TryGetValue( decType, out decInfo );
m_Types.TryGetValue( decType, out TypeInfo decInfo );
if( decInfo == null )
typeHtml.Write( decType.Name );
@ -2201,8 +2193,7 @@ namespace Server.Commands
{
typeHtml.Write( " : " );
TypeInfo baseInfo = null;
m_Types.TryGetValue( baseType, out baseInfo );
m_Types.TryGetValue( baseType, out TypeInfo baseInfo );
if( baseInfo == null )
typeHtml.Write( baseType.Name );
@ -2222,8 +2213,7 @@ namespace Server.Commands
for( int i = 0; i < ifaces.Length; ++i )
{
Type iface = ifaces[i];
TypeInfo ifaceInfo = null;
m_Types.TryGetValue( iface, out ifaceInfo );
m_Types.TryGetValue( iface, out TypeInfo ifaceInfo );
if( extendCount != 0 )
typeHtml.Write( ", " );
@ -2565,9 +2555,9 @@ namespace Server.Commands
private ModelBodyType m_BodyType;
private string m_Name;
public Body Body { get { return m_Body; } }
public ModelBodyType BodyType { get { return m_BodyType; } }
public string Name { get { return m_Name; } }
public Body Body => m_Body;
public ModelBodyType BodyType => m_BodyType;
public string Name => m_Name;
public BodyEntry( Body body, ModelBodyType bodyType, string name )
{

4
Scripts/Commands/Generic/Extensions/BaseExtension.cs
View file

@ -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 ) )

2
Scripts/Commands/Generic/Extensions/Compilers/ConditionalCompiler.cs
View file

@ -566,4 +566,4 @@ namespace Server.Commands.Generic
return (IConditional) Activator.CreateInstance( conditionalType );
}
}
}
}

2
Scripts/Commands/Generic/Extensions/Compilers/DistinctCompiler.cs
View file

@ -246,4 +246,4 @@ namespace Server.Commands.Generic
return (IComparer) Activator.CreateInstance( comparerType );
}
}
}
}

2
Scripts/Commands/Generic/Extensions/Compilers/SortCompiler.cs
View file

@ -169,4 +169,4 @@ namespace Server.Commands.Generic
return (IComparer) Activator.CreateInstance( comparerType );
}
}
}
}

5
Scripts/Commands/Generic/Implementors/BaseCommandImplementor.cs
View file

@ -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
}
}
}
}
}

3
Scripts/Commands/Generic/Implementors/RangeCommandImplementor.cs
View file

@ -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 )
{

5
Scripts/Commands/Generic/Implementors/SerialCommandImplementor.cs
View file

@ -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
}
}
}
}
}

6
Scripts/Commands/Generic/Implementors/SingleCommandImplementor.cs
View file

@ -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 );
}
}
}
}

10
Scripts/Commands/HelpInfo.cs
View file

@ -19,8 +19,8 @@ namespace Server.Commands
private static Dictionary<string, CommandInfo> m_HelpInfos = new Dictionary<string, CommandInfo>();
private static List<CommandInfo> m_SortedHelpInfo = new List<CommandInfo>(); //No need for SortedList cause it's only sorted once at creation...
public static Dictionary<string, CommandInfo> HelpInfos{ get { return m_HelpInfos; } }
public static List<CommandInfo> SortedHelpInfo { get { return m_SortedHelpInfo; } }
public static Dictionary<string, CommandInfo> HelpInfos => m_HelpInfos;
public static List<CommandInfo> 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
}
}
}
}
}

4
Scripts/Engines/BulkOrders/LargeBOD.cs
View file

@ -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();
}
}
}
}

10
Scripts/Engines/BulkOrders/LargeBulkEntry.cs
View file

@ -134,14 +134,10 @@ namespace Server.Engines.BulkOrders
if (m_Cache == null)
m_Cache = new Dictionary<string, Dictionary<string, SmallBulkEntry[]>>();
Dictionary<string, SmallBulkEntry[]> table = null;
if (!m_Cache.TryGetValue(type, out table))
if (!m_Cache.TryGetValue( type, out Dictionary<string, SmallBulkEntry[]> table ))
m_Cache[type] = table = new Dictionary<string, SmallBulkEntry[]>();
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 );
}
}
}
}

4
Scripts/Engines/BulkOrders/SmallBOD.cs
View file

@ -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();
}
}
}
}

10
Scripts/Engines/BulkOrders/SmallBulkEntry.cs
View file

@ -49,14 +49,10 @@ namespace Server.Engines.BulkOrders
if ( m_Cache == null )
m_Cache = new Dictionary<string, Dictionary<string, SmallBulkEntry[]>>();
Dictionary<string, SmallBulkEntry[]> table = null;
if (!m_Cache.TryGetValue(type, out table))
if (!m_Cache.TryGetValue( type, out Dictionary<string, SmallBulkEntry[]> table ))
m_Cache[type] = table = new Dictionary<string, SmallBulkEntry[]>();
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();
}
}
}
}

8
Scripts/Engines/CannedEvil/ChampionSkull.cs
View file

@ -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;
}
}
}
}
}

4
Scripts/Engines/CannedEvil/ChampionSkullBrazier.cs
View file

@ -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;
}
}
}
}

2
Scripts/Engines/CannedEvil/ChampionSpawn.cs
View file

@ -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
{

10
Scripts/Engines/CannedEvil/ChampionSpawnType.cs
View file

@ -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[]
{

4
Scripts/Engines/CannedEvil/HarrowerGate.cs
View file

@ -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;
}
}
}
}

4
Scripts/Engines/CannedEvil/StarRoomGate.cs
View file

@ -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
}
}
}
}
}

9
Scripts/Engines/Chat/ChatUser.cs
View file

@ -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
}
}
}
}
}

6
Scripts/Engines/ConPVP/DuelContext.cs
View file

@ -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
}
}*/
}
}
}

10
Scripts/Engines/ConPVP/Games/BombingRun.cs
View file

@ -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 )
{

16
Scripts/Engines/ConPVP/Games/CTF.cs
View file

@ -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;
}
}
}
}

14
Scripts/Engines/ConPVP/Games/DoubleDom.cs
View file

@ -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 )
{

6
Scripts/Engines/ConPVP/Games/EventGame.cs
View file

@ -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
{
}
}
}
}

14
Scripts/Engines/ConPVP/Games/KingOfTheHill.cs
View file

@ -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)
{

4
Scripts/Engines/Craft/Core/CraftContext.cs
View file

@ -20,7 +20,7 @@ namespace Server.Engines.Craft
private bool m_DoNotColor;
private CraftMarkOption m_MarkOption;
public List<CraftItem> Items { get { return m_Items; } }
public List<CraftItem> 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 );
}
}
}
}

14
Scripts/Engines/Craft/Core/CraftItem.cs
View file

@ -93,11 +93,9 @@ namespace Server.Engines.Craft
}
private static Dictionary<Type, int> _itemIds = new Dictionary<Type, int>();
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;
}

23
Scripts/Engines/Craft/Core/CraftSystem.cs
View file

@ -29,14 +29,14 @@ namespace Server.Engines.Craft
private List<int> m_Recipes;
private List<int> 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 );
}
}
}

2
Scripts/Engines/Craft/Core/Recipes.cs
View file

@ -66,7 +66,7 @@ namespace Server.Engines.Craft
private static Dictionary<int, Recipe> m_Recipes = new Dictionary<int, Recipe>();
public static Dictionary<int, Recipe> Recipes { get { return m_Recipes; } }
public static Dictionary<int, Recipe> Recipes => m_Recipes;
private static int m_LargestRecipeID;
public static int LargestRecipeID{ get{ return m_LargestRecipeID; } }

32
Scripts/Engines/Craft/DefBlacksmithy.cs
View file

@ -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 );

6
Scripts/Engines/Craft/DefBowFletching.cs
View file

@ -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;
}
}
}
}

4
Scripts/Engines/Craft/DefCooking.cs
View file

@ -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.
}
}

12
Scripts/Engines/Craft/DefTailoring.cs
View file

@ -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;
}
}
}
}

12
Scripts/Engines/Craft/DefTinkering.cs
View file

@ -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 )
{
}
}
}
}

4
Scripts/Engines/Ethics/Core/Persistance.cs
View file

@ -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
{
}
}
}
}

4
Scripts/Engines/Ethics/Core/Player.cs
View file

@ -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; } }

4
Scripts/Engines/Ethics/Core/Power.cs
View file

@ -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;
}
}
}
}

10
Scripts/Engines/Ethics/Definitions/EthicDefinition.cs
View file

@ -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 )
{

8
Scripts/Engines/Ethics/Definitions/PowerDefinition.cs
View file

@ -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 )
{

8
Scripts/Engines/Ethics/Evil/Mobiles/UnholyFamiliar.cs
View file

@ -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 )

2
Scripts/Engines/Ethics/Evil/Mobiles/UnholySteed.cs
View file

@ -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 )

8
Scripts/Engines/Ethics/Hero/Mobiles/HolyFamiliar.cs
View file

@ -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 )

2
Scripts/Engines/Ethics/Hero/Mobiles/HolySteed.cs
View file

@ -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 )

6
Scripts/Engines/Factions/Core/Election.cs
View file

@ -24,7 +24,7 @@ namespace Server.Factions
public Faction Faction{ get{ return m_Faction; } }
public List<Candidate> Candidates { get { return m_Candidates; } }
public List<Candidate> 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<Voter> m_Voters;
public Mobile Mobile{ get{ return m_Mobile; } }
public List<Voter> Voters { get { return m_Voters; } }
public List<Voter> Voters => m_Voters;
public int Votes{ get{ return m_Voters.Count; } }
@ -561,4 +561,4 @@ namespace Server.Factions
Campaign,
Election
}
}
}

8
Scripts/Engines/Factions/Core/Faction.cs
View file

@ -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 );

20
Scripts/Engines/Factions/Core/PlayerState.cs
View file

@ -24,15 +24,15 @@ namespace Server.Factions
public Mobile Mobile{ get{ return m_Mobile; } }
public Faction Faction{ get{ return m_Faction; } }
public List<PlayerState> Owner { get { return m_Owner; } }
public List<PlayerState> 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<SilverGivenEntry> SilverGiven { get { return m_SilverGiven; } }
public List<SilverGivenEntry> 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;
}
}
}
}

4
Scripts/Engines/Factions/Core/Town.cs
View file

@ -436,7 +436,7 @@ namespace Server.Factions
return ( mob.AccessLevel >= AccessLevel.GameMaster || mob == Finance );
}
public static List<Town> Towns { get { return Reflector.Towns; } }
public static List<Town> Towns => Reflector.Towns;
public const int SilverCaptureBonus = 10000;
@ -551,4 +551,4 @@ namespace Server.Factions
}
}
}
}
}

4
Scripts/Engines/Factions/Core/VendorList.cs
View file

@ -10,7 +10,7 @@ namespace Server.Factions
private List<BaseFactionVendor> m_Vendors;
public VendorDefinition Definition{ get{ return m_Definition; } }
public List<BaseFactionVendor> Vendors { get { return m_Vendors; } }
public List<BaseFactionVendor> Vendors => m_Vendors;
public BaseFactionVendor Construct( Town town, Faction faction )
{
@ -24,4 +24,4 @@ namespace Server.Factions
m_Vendors = new List<BaseFactionVendor>();
}
}
}
}

4
Scripts/Engines/Factions/Definitions/FactionDefinition.cs
View file

@ -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;
}
}
}
}

20
Scripts/Engines/Factions/Gumps/FactionStoneGump.cs
View file

@ -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
}
}
}
}
}

24
Scripts/Engines/Factions/Gumps/FinanceGump.cs
View file

@ -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
}
}
}
}
}

4
Scripts/Engines/Factions/Items/FactionStone.cs
View file

@ -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
}
}
}
}
}

4
Scripts/Engines/Factions/Items/JoinStone.cs
View file

@ -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
}
}
}
}
}

4
Scripts/Engines/Factions/Items/StrongholdMonolith.cs
View file

@ -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();
}
}
}
}

4
Scripts/Engines/Factions/Items/TownMonolith.cs
View file

@ -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();
}
}
}
}

4
Scripts/Engines/Factions/Items/TownStone.cs
View file

@ -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
}
}
}
}
}

20
Scripts/Engines/Factions/Items/Traps/FactionExplosionTrap.cs
View file

@ -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();
}
}
}
}

20
Scripts/Engines/Factions/Items/Traps/FactionGasTrap.cs
View file

@ -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();
}
}
}
}

20
Scripts/Engines/Factions/Items/Traps/FactionSawTrap.cs
View file

@ -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();
}
}
}
}

20
Scripts/Engines/Factions/Items/Traps/FactionSpikeTrap.cs
View file

@ -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();
}
}
}
}

4
Scripts/Engines/Factions/Items/Traps/FactionTrapRemovalKit.cs
View file

@ -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
}
}
}
}
}

4
Scripts/Engines/Factions/Mobiles/FactionWarHorse.cs
View file

@ -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
}
}
}
}
}

2
Scripts/Engines/Factions/Mobiles/Guards/BaseFactionGuard.cs
View file

@ -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 )
{

4
Scripts/Engines/Factions/Mobiles/Guards/Types/FactionBerserker.cs
View file

@ -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();
}
}
}
}

4
Scripts/Engines/Factions/Mobiles/Guards/Types/FactionDeathKnight.cs
View file

@ -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();
}
}
}
}

4
Scripts/Engines/Factions/Mobiles/Guards/Types/FactionDragoon.cs
View file

@ -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();
}
}
}
}

4
Scripts/Engines/Factions/Mobiles/Guards/Types/FactionHenchman.cs
View file

@ -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();
}
}
}
}

4
Scripts/Engines/Factions/Mobiles/Guards/Types/FactionKnight.cs
View file

@ -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();
}
}
}
}

4
Scripts/Engines/Factions/Mobiles/Guards/Types/FactionMercenary.cs
View file

@ -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();
}
}
}
}

4
Scripts/Engines/Factions/Mobiles/Guards/Types/FactionNecromancer.cs
View file

@ -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();
}
}
}
}

4
Scripts/Engines/Factions/Mobiles/Guards/Types/FactionPaladin.cs
View file

@ -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();
}
}
}
}

4
Scripts/Engines/Factions/Mobiles/Guards/Types/FactionSorceress.cs
View file

@ -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();
}
}
}
}

4
Scripts/Engines/Factions/Mobiles/Guards/Types/FactionWizard.cs
View file

@ -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();
}
}
}
}

6
Scripts/Engines/Factions/Mobiles/Vendors/FactionBoardVendor.cs
View file

@ -54,8 +54,8 @@ namespace Server.Factions
{
}
public override IShopSellInfo SellInfo { get { return m_SellInfo; } }
public override List<GenericBuyInfo> BuyInfo { get { return m_BuyInfo; } }
public override IShopSellInfo SellInfo => m_SellInfo;
public override List<GenericBuyInfo> BuyInfo => m_BuyInfo;
public class InternalBuyInfo : List<GenericBuyInfo>
{
@ -73,4 +73,4 @@ namespace Server.Factions
}
}
}
}
}

6
Scripts/Engines/Factions/Mobiles/Vendors/FactionBottleVendor.cs
View file

@ -59,8 +59,8 @@ namespace Server.Factions
{
}
public override IShopSellInfo SellInfo { get { return m_SellInfo; } }
public override List<GenericBuyInfo> BuyInfo { get { return m_BuyInfo; } }
public override IShopSellInfo SellInfo => m_SellInfo;
public override List<GenericBuyInfo> BuyInfo => m_BuyInfo;
public class InternalBuyInfo : List<GenericBuyInfo>
{
@ -78,4 +78,4 @@ namespace Server.Factions
}
}
}
}
}

6
Scripts/Engines/Factions/Mobiles/Vendors/FactionOreVendor.cs
View file

@ -57,8 +57,8 @@ namespace Server.Factions
{
}
public override IShopSellInfo SellInfo { get { return m_SellInfo; } }
public override List<GenericBuyInfo> BuyInfo { get { return m_BuyInfo; } }
public override IShopSellInfo SellInfo => m_SellInfo;
public override List<GenericBuyInfo> BuyInfo => m_BuyInfo;
public class InternalBuyInfo : List<GenericBuyInfo>
{
@ -76,4 +76,4 @@ namespace Server.Factions
}
}
}
}
}

6
Scripts/Engines/Factions/Mobiles/Vendors/FactionReagentVendor.cs
View file

@ -64,8 +64,8 @@ namespace Server.Factions
{
}
public override IShopSellInfo SellInfo { get { return m_SellInfo; } }
public override List<GenericBuyInfo> BuyInfo { get { return m_BuyInfo; } }
public override IShopSellInfo SellInfo => m_SellInfo;
public override List<GenericBuyInfo> BuyInfo => m_BuyInfo;
public class InternalBuyInfo : List<GenericBuyInfo>
{
@ -92,4 +92,4 @@ namespace Server.Factions
}
}
}
}
}

4
Scripts/Engines/Harvest/Core/BonusHarvestResource.cs
View file

@ -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;
}
}
}
}

8
Scripts/Engines/Harvest/Core/HarvestDefinition.cs
View file

@ -77,15 +77,13 @@ namespace Server.Engines.Harvest
x /= m_BankWidth;
y /= m_BankHeight;
Dictionary<Point2D, HarvestBank> banks = null;
m_BanksByMap.TryGetValue( map, out banks );
m_BanksByMap.TryGetValue( map, out Dictionary<Point2D, HarvestBank> banks );
if ( banks == null )
m_BanksByMap[map] = banks = new Dictionary<Point2D, HarvestBank>();
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
}
}
}
}
}

8
Scripts/Engines/Harvest/Core/HarvestSystem.cs
View file

@ -11,7 +11,7 @@ namespace Server.Engines.Harvest
{
private List<HarvestDefinition> m_Definitions;
public List<HarvestDefinition> Definitions { get { return m_Definitions; } }
public List<HarvestDefinition> 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
{
}
}
}
}

20
Scripts/Engines/Khaldun/Books/GrimmochJournal.cs
View file

@ -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();
}
}
}
}

14
Scripts/Engines/Khaldun/Books/LysanderNotebook.cs
View file

@ -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();
}
}
}
}

28
Scripts/Engines/Khaldun/Books/TavarasJournal.cs
View file

@ -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();
}
}
}
}

4
Scripts/Engines/Khaldun/KhaldunPitTeleporter.cs
View file

@ -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();
}
}
}
}

5
Scripts/Engines/Khaldun/PuzzleChest.cs
View file

@ -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;
}

BIN
Scripts/Engines/MLQuests/Definitions/AGhostOfCovetous.cs
View file

Binary file not shown.

2
Scripts/Engines/MLQuests/Definitions/BaseEscort.cs
View file

@ -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()
{

10
Scripts/Engines/MLQuests/Definitions/BlightedGrove.cs
View file

@ -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()

2
Scripts/Engines/MLQuests/Definitions/Britannia.cs
View file

@ -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()
{

2
Scripts/Engines/MLQuests/Definitions/HonestBeggar.cs
View file

@ -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()
{

4
Scripts/Engines/MLQuests/Definitions/LostItems.cs
View file

@ -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()

10
Scripts/Engines/MLQuests/Definitions/MistakenIdentity.cs
View file

@ -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()

2
Scripts/Engines/MLQuests/Definitions/NewHavenSkillTraining.cs
View file

@ -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 )
{

10
Scripts/Engines/MLQuests/Definitions/Sanctuary.cs
View file

@ -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()

24
Scripts/Engines/MLQuests/Definitions/Spellweaving.cs
View file

@ -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()

6
Scripts/Engines/MLQuests/Definitions/TheAncientWorld.cs
View file

@ -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()

4
Scripts/Engines/MLQuests/Definitions/UnfadingMemories.cs
View file

@ -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()

Some files were not shown because too many files have changed in this diff Show more