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

Changes properties to use automatic property initializers

Browse source
This commit is contained in:
Kamron Batman 2018-09-14 15:23:29 -07:00
parent f0a48ad431
commit 06fa31a7bf
623 changed files with 13072 additions and 19304 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -9,14 +9,9 @@ namespace Server.Factions
[CustomEnum( new[]{ "Britain", "Magincia", "Minoc", "Moonglow", "Skara Brae", "Trinsic", "Vesper", "Yew" } )]
public abstract class Town : IComparable
{
private TownDefinition m_Definition;
private TownState m_State;
public TownDefinition Definition
{
get => m_Definition;
set => m_Definition = value;
}
public TownDefinition Definition { get; set; }
public TownState State
{
@ -244,29 +239,18 @@ namespace Server.Factions
return list;
}
private List<VendorList> m_VendorLists;
private List<GuardList> m_GuardLists;
public List<VendorList> VendorLists { get; set; }
public List<VendorList> VendorLists
{
get => m_VendorLists;
set => m_VendorLists = value;
}
public List<GuardList> GuardLists
{
get => m_GuardLists;
set => m_GuardLists = value;
}
public List<GuardList> GuardLists { get; set; }
public void ConstructGuardLists()
{
GuardDefinition[] defs = ( Owner == null ? new GuardDefinition[0] : Owner.Definition.Guards );
m_GuardLists = new List<GuardList>();
GuardLists = new List<GuardList>();
for ( int i = 0; i < defs.Length; ++i )
m_GuardLists.Add( new GuardList( defs[i] ) );
GuardLists.Add( new GuardList( defs[i] ) );
}
public GuardList FindGuardList( Type type )
@ -288,10 +272,10 @@ namespace Server.Factions
{
VendorDefinition[] defs = VendorDefinition.Definitions;
m_VendorLists = new List<VendorList>();
VendorLists = new List<VendorList>();
for ( int i = 0; i < defs.Length; ++i )
m_VendorLists.Add( new VendorList( defs[i] ) );
VendorLists.Add( new VendorList( defs[i] ) );
}
public VendorList FindVendorList( Type type )
@ -468,12 +452,12 @@ namespace Server.Factions
public int CompareTo( object obj )
{
return m_Definition.Sort - ((Town)obj).m_Definition.Sort;
return Definition.Sort - ((Town)obj).Definition.Sort;
}
public override string ToString()
{
return m_Definition.FriendlyName;
return Definition.FriendlyName;
}
public static void WriteReference( GenericWriter writer, Town town )