Fixes body expression style.

This commit is contained in:
Kamron Batman 2018-09-14 08:46:14 -07:00
parent 3f0a72a62f
commit 33f5e77a24
957 changed files with 7424 additions and 15973 deletions

View file

@ -15,12 +15,6 @@ namespace Server.Mobiles
m_ControlSlots = controlSlots;
}
public override int ControlSlots
{
get
{
return m_ControlSlots;
}
}
public override int ControlSlots => m_ControlSlots;
}
}

View file

@ -48,7 +48,9 @@ namespace Server.Mobiles
public override bool IsInvulnerable => true;
public virtual DateTime NextTrickOrTreat { get { return m_NextTrickOrTreat; } set { m_NextTrickOrTreat = value; } }
public virtual DateTime NextTrickOrTreat { get => m_NextTrickOrTreat;
set => m_NextTrickOrTreat = value;
}
public override bool ShowFameTitle => false;
@ -186,23 +188,11 @@ namespace Server.Mobiles
public DateTime LastRestock
{
get
{
return m_LastRestock;
}
set
{
m_LastRestock = value;
}
get => m_LastRestock;
set => m_LastRestock = value;
}
public virtual TimeSpan RestockDelay
{
get
{
return TimeSpan.FromHours( 1 );
}
}
public virtual TimeSpan RestockDelay => TimeSpan.FromHours( 1 );
public Container BuyPack
{
@ -220,7 +210,7 @@ namespace Server.Mobiles
public abstract void InitSBInfo();
public virtual bool IsTokunoVendor { get { return ( Map == Map.Tokuno ); } }
public virtual bool IsTokunoVendor => ( Map == Map.Tokuno );
protected void LoadSBInfo()
{
@ -292,10 +282,7 @@ namespace Server.Mobiles
return Utility.RandomNeutralHue();
}
public virtual VendorShoeType ShoeType
{
get { return VendorShoeType.Shoes; }
}
public virtual VendorShoeType ShoeType => VendorShoeType.Shoes;
public virtual void CheckMorph()
{

View file

@ -110,9 +110,10 @@ namespace Server.Mobiles
private object[] m_Args;
private IEntity m_DisplayEntity;
public virtual int ControlSlots{ get{ return 0; } }
public virtual int ControlSlots => 0;
public virtual bool CanCacheDisplay{ get{ return false; } } //return ( m_Args == null || m_Args.Length == 0 ); }
public virtual bool CanCacheDisplay //return ( m_Args == null || m_Args.Length == 0 ); }
=> false;
private bool IsDeleted( IEntity obj )
{
@ -148,24 +149,24 @@ namespace Server.Mobiles
public Type Type
{
get{ return m_Type; }
set{ m_Type = value; }
get => m_Type;
set => m_Type = value;
}
public string Name
{
get{ return m_Name; }
set{ m_Name = value; }
get => m_Name;
set => m_Name = value;
}
public int DefaultPrice{ get{ return m_PriceScalar; } }
public int DefaultPrice => m_PriceScalar;
private int m_PriceScalar;
public int PriceScalar
{
get{ return m_PriceScalar; }
set{ m_PriceScalar = value; }
get => m_PriceScalar;
set => m_PriceScalar = value;
}
public int Price
@ -193,37 +194,37 @@ namespace Server.Mobiles
return m_Price;
}
set{ m_Price = value; }
set => m_Price = value;
}
public int ItemID
{
get{ return m_ItemID; }
set{ m_ItemID = value; }
get => m_ItemID;
set => m_ItemID = value;
}
public int Hue
{
get{ return m_Hue; }
set{ m_Hue = value; }
get => m_Hue;
set => m_Hue = value;
}
public int Amount
{
get{ return m_Amount; }
get => m_Amount;
set{ if ( value < 0 ) value = 0; m_Amount = value; }
}
public int MaxAmount
{
get{ return m_MaxAmount; }
set{ m_MaxAmount = value; }
get => m_MaxAmount;
set => m_MaxAmount = value;
}
public object[] Args
{
get{ return m_Args; }
set{ m_Args = value; }
get => m_Args;
set => m_Args = value;
}
public GenericBuyInfo( Type type, int price, int amount, int itemID, int hue ) : this( null, type, price, amount, itemID, hue, null )

View file

@ -5,7 +5,7 @@ namespace Server.Mobiles
public class Alchemist : BaseVendor
{
private List<SBInfo> m_SBInfos = new List<SBInfo>();
protected override List<SBInfo> SBInfos{ get { return m_SBInfos; } }
protected override List<SBInfo> SBInfos => m_SBInfos;
public override NpcGuild NpcGuild => NpcGuild.MagesGuild;
@ -21,10 +21,7 @@ namespace Server.Mobiles
m_SBInfos.Add( new SBAlchemist() );
}
public override VendorShoeType ShoeType
{
get{ return Utility.RandomBool() ? VendorShoeType.Shoes : VendorShoeType.Sandals; }
}
public override VendorShoeType ShoeType => Utility.RandomBool() ? VendorShoeType.Shoes : VendorShoeType.Sandals;
public override void InitOutfit()
{

View file

@ -11,7 +11,7 @@ namespace Server.Mobiles
public class AnimalTrainer : BaseVendor
{
private List<SBInfo> m_SBInfos = new List<SBInfo>();
protected override List<SBInfo> SBInfos{ get { return m_SBInfos; } }
protected override List<SBInfo> SBInfos => m_SBInfos;
[Constructible]
public AnimalTrainer() : base( "the animal trainer" )
@ -26,10 +26,7 @@ namespace Server.Mobiles
m_SBInfos.Add( new SBAnimalTrainer() );
}
public override VendorShoeType ShoeType
{
get{ return Female ? VendorShoeType.ThighBoots : VendorShoeType.Boots; }
}
public override VendorShoeType ShoeType => Female ? VendorShoeType.ThighBoots : VendorShoeType.Boots;
public override int GetShoeHue()
{

View file

@ -5,7 +5,7 @@ namespace Server.Mobiles
public class Architect : BaseVendor
{
private List<SBInfo> m_SBInfos = new List<SBInfo>();
protected override List<SBInfo> SBInfos{ get { return m_SBInfos; } }
protected override List<SBInfo> SBInfos => m_SBInfos;
public override NpcGuild NpcGuild => NpcGuild.TinkersGuild;

View file

@ -5,7 +5,7 @@ namespace Server.Mobiles
public class Armorer : BaseVendor
{
private List<SBInfo> m_SBInfos = new List<SBInfo>();
protected override List<SBInfo> SBInfos{ get { return m_SBInfos; } }
protected override List<SBInfo> SBInfos => m_SBInfos;
[Constructible]
public Armorer() : base( "the armorer" )
@ -60,10 +60,7 @@ namespace Server.Mobiles
}
}
public override VendorShoeType ShoeType
{
get{ return VendorShoeType.Boots; }
}
public override VendorShoeType ShoeType => VendorShoeType.Boots;
public override void InitOutfit()
{

View file

@ -5,7 +5,7 @@ namespace Server.Mobiles
public class Baker : BaseVendor
{
private List<SBInfo> m_SBInfos = new List<SBInfo>();
protected override List<SBInfo> SBInfos{ get { return m_SBInfos; } }
protected override List<SBInfo> SBInfos => m_SBInfos;
[Constructible]
public Baker() : base( "the baker" )

View file

@ -5,7 +5,7 @@ namespace Server.Mobiles
public class Bard : BaseVendor
{
private List<SBInfo> m_SBInfos = new List<SBInfo>();
protected override List<SBInfo> SBInfos{ get { return m_SBInfos; } }
protected override List<SBInfo> SBInfos => m_SBInfos;
public override NpcGuild NpcGuild => NpcGuild.BardsGuild;

View file

@ -6,7 +6,7 @@ namespace Server.Mobiles
public class Barkeeper : BaseVendor
{
private List<SBInfo> m_SBInfos = new List<SBInfo>();
protected override List<SBInfo> SBInfos{ get { return m_SBInfos; } }
protected override List<SBInfo> SBInfos => m_SBInfos;
public override void InitSBInfo()
{

View file

@ -5,7 +5,7 @@ namespace Server.Mobiles
public class Beekeeper : BaseVendor
{
private List<SBInfo> m_SBInfos = new List<SBInfo>();
protected override List<SBInfo> SBInfos{ get { return m_SBInfos; } }
protected override List<SBInfo> SBInfos => m_SBInfos;
[Constructible]
public Beekeeper() : base( "the beekeeper" )

View file

@ -7,7 +7,7 @@ namespace Server.Mobiles
public class Blacksmith : BaseVendor
{
private List<SBInfo> m_SBInfos = new List<SBInfo>();
protected override List<SBInfo> SBInfos{ get { return m_SBInfos; } }
protected override List<SBInfo> SBInfos => m_SBInfos;
public override NpcGuild NpcGuild => NpcGuild.BlacksmithsGuild;
@ -52,10 +52,7 @@ namespace Server.Mobiles
}
}
public override VendorShoeType ShoeType
{
get{ return VendorShoeType.None; }
}
public override VendorShoeType ShoeType => VendorShoeType.None;
public override void InitOutfit()
{

View file

@ -6,7 +6,7 @@ namespace Server.Mobiles
public class Bowyer : BaseVendor
{
private List<SBInfo> m_SBInfos = new List<SBInfo>();
protected override List<SBInfo> SBInfos{ get { return m_SBInfos; } }
protected override List<SBInfo> SBInfos => m_SBInfos;
[Constructible]
public Bowyer() : base( "the bowyer" )
@ -15,10 +15,7 @@ namespace Server.Mobiles
SetSkill( SkillName.Archery, 80.0, 100.0 );
}
public override VendorShoeType ShoeType
{
get{ return Female ? VendorShoeType.ThighBoots : VendorShoeType.Boots; }
}
public override VendorShoeType ShoeType => Female ? VendorShoeType.ThighBoots : VendorShoeType.Boots;
public override int GetShoeHue()
{

View file

@ -5,7 +5,7 @@ namespace Server.Mobiles
public class Butcher : BaseVendor
{
private List<SBInfo> m_SBInfos = new List<SBInfo>();
protected override List<SBInfo> SBInfos{ get { return m_SBInfos; } }
protected override List<SBInfo> SBInfos => m_SBInfos;
[Constructible]
public Butcher() : base( "the butcher" )

View file

@ -5,7 +5,7 @@ namespace Server.Mobiles
public class Carpenter : BaseVendor
{
private List<SBInfo> m_SBInfos = new List<SBInfo>();
protected override List<SBInfo> SBInfos{ get { return m_SBInfos; } }
protected override List<SBInfo> SBInfos => m_SBInfos;
public override NpcGuild NpcGuild => NpcGuild.TinkersGuild;

View file

@ -5,7 +5,7 @@ namespace Server.Mobiles
public class Cobbler : BaseVendor
{
private List<SBInfo> m_SBInfos = new List<SBInfo>();
protected override List<SBInfo> SBInfos{ get { return m_SBInfos; } }
protected override List<SBInfo> SBInfos => m_SBInfos;
[Constructible]
public Cobbler() : base( "the cobbler" )
@ -18,10 +18,7 @@ namespace Server.Mobiles
m_SBInfos.Add( new SBCobbler() );
}
public override VendorShoeType ShoeType
{
get{ return Utility.RandomBool() ? VendorShoeType.Sandals : VendorShoeType.Shoes; }
}
public override VendorShoeType ShoeType => Utility.RandomBool() ? VendorShoeType.Sandals : VendorShoeType.Shoes;
public Cobbler( Serial serial ) : base( serial )
{

View file

@ -5,7 +5,7 @@ namespace Server.Mobiles
public class Cook : BaseVendor
{
private List<SBInfo> m_SBInfos = new List<SBInfo>();
protected override List<SBInfo> SBInfos{ get { return m_SBInfos; } }
protected override List<SBInfo> SBInfos => m_SBInfos;
[Constructible]
public Cook() : base( "the cook" )
@ -22,10 +22,7 @@ namespace Server.Mobiles
m_SBInfos.Add( new SBSECook() );
}
public override VendorShoeType ShoeType
{
get{ return Utility.RandomBool() ? VendorShoeType.Sandals : VendorShoeType.Shoes; }
}
public override VendorShoeType ShoeType => Utility.RandomBool() ? VendorShoeType.Sandals : VendorShoeType.Shoes;
public override void InitOutfit()
{

View file

@ -8,7 +8,7 @@ namespace Server.Mobiles
public class CustomHairstylist : BaseVendor
{
private List<SBInfo> m_SBInfos = new List<SBInfo>();
protected override List<SBInfo> SBInfos{ get { return m_SBInfos; } }
protected override List<SBInfo> SBInfos => m_SBInfos;
public override bool ClickTitle => false;
@ -59,10 +59,7 @@ namespace Server.Mobiles
return Utility.RandomBrightHue();
}
public override VendorShoeType ShoeType
{
get{ return Utility.RandomBool() ? VendorShoeType.Shoes : VendorShoeType.Sandals; }
}
public override VendorShoeType ShoeType => Utility.RandomBool() ? VendorShoeType.Shoes : VendorShoeType.Sandals;
public override void InitOutfit()
{
@ -103,12 +100,12 @@ namespace Server.Mobiles
private Type m_GumpType;
private object[] m_GumpArgs;
public int Title{ get{ return m_Title; } }
public string TitleString{ get{ return m_TitleString; } }
public int Price{ get{ return m_Price; } }
public bool FacialHair{ get{ return m_FacialHair; } }
public Type GumpType{ get{ return m_GumpType; } }
public object[] GumpArgs{ get{ return m_GumpArgs; } }
public int Title => m_Title;
public string TitleString => m_TitleString;
public int Price => m_Price;
public bool FacialHair => m_FacialHair;
public Type GumpType => m_GumpType;
public object[] GumpArgs => m_GumpArgs;
public HairstylistBuyInfo( int title, int price, bool facialHair, Type gumpType, object[] args )
{
@ -236,8 +233,8 @@ namespace Server.Mobiles
private string m_Name;
private int[] m_Hues;
public string Name{ get{ return m_Name; } }
public int[] Hues{ get{ return m_Hues; } }
public string Name => m_Name;
public int[] Hues => m_Hues;
public ChangeHairHueEntry( string name, int[] hues )
{
@ -396,10 +393,10 @@ namespace Server.Mobiles
private int m_GumpID;
private int m_X, m_Y;
public int ItemID{ get{ return m_ItemID; } }
public int GumpID{ get{ return m_GumpID; } }
public int X{ get{ return m_X; } }
public int Y{ get{ return m_Y; } }
public int ItemID => m_ItemID;
public int GumpID => m_GumpID;
public int X => m_X;
public int Y => m_Y;
public ChangeHairstyleEntry( int gumpID, int x, int y, int itemID )
{

View file

@ -5,7 +5,7 @@ namespace Server.Mobiles
public class Farmer : BaseVendor
{
private List<SBInfo> m_SBInfos = new List<SBInfo>();
protected override List<SBInfo> SBInfos{ get { return m_SBInfos; } }
protected override List<SBInfo> SBInfos => m_SBInfos;
[Constructible]
public Farmer() : base( "the farmer" )
@ -20,10 +20,7 @@ namespace Server.Mobiles
m_SBInfos.Add( new SBFarmer() );
}
public override VendorShoeType ShoeType
{
get{ return VendorShoeType.ThighBoots; }
}
public override VendorShoeType ShoeType => VendorShoeType.ThighBoots;
public override int GetShoeHue()
{

View file

@ -5,7 +5,7 @@ namespace Server.Mobiles
public class Fisherman : BaseVendor
{
private List<SBInfo> m_SBInfos = new List<SBInfo>();
protected override List<SBInfo> SBInfos{ get { return m_SBInfos; } }
protected override List<SBInfo> SBInfos => m_SBInfos;
public override NpcGuild NpcGuild => NpcGuild.FishermensGuild;

View file

@ -5,7 +5,7 @@ namespace Server.Mobiles
public class Furtrader : BaseVendor
{
private List<SBInfo> m_SBInfos = new List<SBInfo>();
protected override List<SBInfo> SBInfos{ get { return m_SBInfos; } }
protected override List<SBInfo> SBInfos => m_SBInfos;
[Constructible]
public Furtrader() : base( "the furtrader" )

View file

@ -6,7 +6,7 @@ namespace Server.Mobiles
public class Glassblower : BaseVendor
{
private List<SBInfo> m_SBInfos = new List<SBInfo>();
protected override List<SBInfo> SBInfos{ get { return m_SBInfos; } }
protected override List<SBInfo> SBInfos => m_SBInfos;
public override NpcGuild NpcGuild => NpcGuild.MagesGuild;

View file

@ -5,7 +5,7 @@ namespace Server.Mobiles
public class GolemCrafter : BaseVendor
{
private List<SBInfo> m_SBInfos = new List<SBInfo>();
protected override List<SBInfo> SBInfos{ get { return m_SBInfos; } }
protected override List<SBInfo> SBInfos => m_SBInfos;
[Constructible]
public GolemCrafter() : base( "the golem crafter" )

View file

@ -8,18 +8,18 @@ namespace Server.Mobiles
public abstract class BaseGuildmaster : BaseVendor
{
private List<SBInfo> m_SBInfos = new List<SBInfo>();
protected override List<SBInfo> SBInfos{ get { return m_SBInfos; } }
protected override List<SBInfo> SBInfos => m_SBInfos;
public override bool IsActiveVendor => false;
public override bool ClickTitle => false;
public virtual int JoinCost{ get{ return 500; } }
public virtual int JoinCost => 500;
public virtual TimeSpan JoinAge{ get{ return TimeSpan.FromDays( 0.0 ); } }
public virtual TimeSpan JoinGameAge{ get{ return TimeSpan.FromDays( 2.0 ); } }
public virtual TimeSpan QuitAge{ get{ return TimeSpan.FromDays( 7.0 ); } }
public virtual TimeSpan QuitGameAge{ get{ return TimeSpan.FromDays( 4.0 ); } }
public virtual TimeSpan JoinAge => TimeSpan.FromDays( 0.0 );
public virtual TimeSpan JoinGameAge => TimeSpan.FromDays( 2.0 );
public virtual TimeSpan QuitAge => TimeSpan.FromDays( 7.0 );
public virtual TimeSpan QuitGameAge => TimeSpan.FromDays( 4.0 );
public override void InitSBInfo()
{

View file

@ -21,10 +21,7 @@ namespace Server.Mobiles
SBInfos.Add( new SBBlacksmith() );
}
public override VendorShoeType ShoeType
{
get{ return VendorShoeType.ThighBoots; }
}
public override VendorShoeType ShoeType => VendorShoeType.ThighBoots;
public override void InitOutfit()
{

View file

@ -14,10 +14,7 @@ namespace Server.Mobiles
SetSkill( SkillName.SpiritSpeak, 65.0, 88.0 );
}
public override VendorShoeType ShoeType
{
get{ return VendorShoeType.Sandals; }
}
public override VendorShoeType ShoeType => VendorShoeType.Sandals;
public override void InitOutfit()
{

View file

@ -16,10 +16,7 @@ namespace Server.Mobiles
SetSkill( SkillName.Macing, 36.0, 68.0 );
}
public override VendorShoeType ShoeType
{
get{ return Utility.RandomBool() ? VendorShoeType.Shoes : VendorShoeType.Sandals; }
}
public override VendorShoeType ShoeType => Utility.RandomBool() ? VendorShoeType.Shoes : VendorShoeType.Sandals;
public override void InitOutfit()
{

View file

@ -11,10 +11,7 @@ namespace Server.Mobiles
Title = "the gypsy animal herder";
}
public override VendorShoeType ShoeType
{
get{ return Female ? VendorShoeType.ThighBoots : VendorShoeType.Boots; }
}
public override VendorShoeType ShoeType => Female ? VendorShoeType.ThighBoots : VendorShoeType.Boots;
public override int GetShoeHue()
{

View file

@ -6,7 +6,7 @@ namespace Server.Mobiles
public class GypsyMaiden : BaseVendor
{
private List<SBInfo> m_SBInfos = new List<SBInfo>();
protected override List<SBInfo> SBInfos{ get { return m_SBInfos; } }
protected override List<SBInfo> SBInfos => m_SBInfos;
[Constructible]
public GypsyMaiden() : base( "the gypsy maiden" )

View file

@ -5,7 +5,7 @@ namespace Server.Mobiles
public class HairStylist : BaseVendor
{
private List<SBInfo> m_SBInfos = new List<SBInfo>();
protected override List<SBInfo> SBInfos{ get { return m_SBInfos; } }
protected override List<SBInfo> SBInfos => m_SBInfos;
[Constructible]
public HairStylist() : base( "the hair stylist" )

View file

@ -5,7 +5,7 @@ namespace Server.Mobiles
public class Herbalist : BaseVendor
{
private List<SBInfo> m_SBInfos = new List<SBInfo>();
protected override List<SBInfo> SBInfos{ get { return m_SBInfos; } }
protected override List<SBInfo> SBInfos => m_SBInfos;
public override NpcGuild NpcGuild => NpcGuild.MagesGuild;
@ -22,10 +22,7 @@ namespace Server.Mobiles
m_SBInfos.Add( new SBHerbalist() );
}
public override VendorShoeType ShoeType
{
get{ return Utility.RandomBool() ? VendorShoeType.Shoes : VendorShoeType.Sandals; }
}
public override VendorShoeType ShoeType => Utility.RandomBool() ? VendorShoeType.Shoes : VendorShoeType.Sandals;
public Herbalist( Serial serial ) : base( serial )
{

View file

@ -6,7 +6,7 @@ namespace Server.Mobiles
public class HolyMage : BaseVendor
{
private List<SBInfo> m_SBInfos = new List<SBInfo>();
protected override List<SBInfo> SBInfos{ get { return m_SBInfos; } }
protected override List<SBInfo> SBInfos => m_SBInfos;
[Constructible]
public HolyMage() : base( "the Holy Mage" )

View file

@ -5,7 +5,7 @@ namespace Server.Mobiles
public class InnKeeper : BaseVendor
{
private List<SBInfo> m_SBInfos = new List<SBInfo>();
protected override List<SBInfo> SBInfos{ get { return m_SBInfos; } }
protected override List<SBInfo> SBInfos => m_SBInfos;
[Constructible]
public InnKeeper() : base( "the innkeeper" )
@ -20,10 +20,7 @@ namespace Server.Mobiles
m_SBInfos.Add( new SBSEFood() );
}
public override VendorShoeType ShoeType
{
get{ return Utility.RandomBool() ? VendorShoeType.Sandals : VendorShoeType.Shoes; }
}
public override VendorShoeType ShoeType => Utility.RandomBool() ? VendorShoeType.Sandals : VendorShoeType.Shoes;
public InnKeeper( Serial serial ) : base( serial )
{

View file

@ -6,7 +6,7 @@ namespace Server.Mobiles
public class IronWorker : BaseVendor
{
private List<SBInfo> m_SBInfos = new List<SBInfo>();
protected override List<SBInfo> SBInfos{ get { return m_SBInfos; } }
protected override List<SBInfo> SBInfos => m_SBInfos;
[Constructible]
public IronWorker() : base( "the iron worker" )
@ -40,10 +40,7 @@ namespace Server.Mobiles
m_SBInfos.Add( new SBLeatherArmor() );
}
public override VendorShoeType ShoeType
{
get{ return VendorShoeType.None; }
}
public override VendorShoeType ShoeType => VendorShoeType.None;
public override void InitOutfit()
{

View file

@ -5,7 +5,7 @@ namespace Server.Mobiles
public class Jeweler : BaseVendor
{
private List<SBInfo> m_SBInfos = new List<SBInfo>();
protected override List<SBInfo> SBInfos{ get { return m_SBInfos; } }
protected override List<SBInfo> SBInfos => m_SBInfos;
[Constructible]
public Jeweler() : base( "the jeweler" )

View file

@ -6,7 +6,7 @@ namespace Server.Mobiles
public class KeeperOfChivalry : BaseVendor
{
private List<SBInfo> m_SBInfos = new List<SBInfo>();
protected override List<SBInfo> SBInfos{ get { return m_SBInfos; } }
protected override List<SBInfo> SBInfos => m_SBInfos;
[Constructible]
public KeeperOfChivalry() : base( "the Keeper of Chivalry" )

View file

@ -5,7 +5,7 @@ namespace Server.Mobiles
public class LeatherWorker : BaseVendor
{
private List<SBInfo> m_SBInfos = new List<SBInfo>();
protected override List<SBInfo> SBInfos{ get { return m_SBInfos; } }
protected override List<SBInfo> SBInfos => m_SBInfos;
[Constructible]
public LeatherWorker() : base( "the leather worker" )

View file

@ -5,7 +5,7 @@ namespace Server.Mobiles
public class Mage : BaseVendor
{
private List<SBInfo> m_SBInfos = new List<SBInfo>();
protected override List<SBInfo> SBInfos{ get { return m_SBInfos; } }
protected override List<SBInfo> SBInfos => m_SBInfos;
public override NpcGuild NpcGuild => NpcGuild.MagesGuild;
@ -25,10 +25,7 @@ namespace Server.Mobiles
m_SBInfos.Add( new SBMage() );
}
public override VendorShoeType ShoeType
{
get{ return Utility.RandomBool() ? VendorShoeType.Shoes : VendorShoeType.Sandals; }
}
public override VendorShoeType ShoeType => Utility.RandomBool() ? VendorShoeType.Shoes : VendorShoeType.Sandals;
public override void InitOutfit()
{

View file

@ -5,7 +5,7 @@ namespace Server.Mobiles
public class Mapmaker : BaseVendor
{
private List<SBInfo> m_SBInfos = new List<SBInfo>();
protected override List<SBInfo> SBInfos{ get { return m_SBInfos; } }
protected override List<SBInfo> SBInfos => m_SBInfos;
[Constructible]
public Mapmaker() : base( "the mapmaker" )

View file

@ -5,7 +5,7 @@ namespace Server.Mobiles
public class Miller : BaseVendor
{
private List<SBInfo> m_SBInfos = new List<SBInfo>();
protected override List<SBInfo> SBInfos{ get { return m_SBInfos; } }
protected override List<SBInfo> SBInfos => m_SBInfos;
[Constructible]
public Miller() : base( "the miller" )

View file

@ -5,7 +5,7 @@ namespace Server.Mobiles
public class Miner : BaseVendor
{
private List<SBInfo> m_SBInfos = new List<SBInfo>();
protected override List<SBInfo> SBInfos{ get { return m_SBInfos; } }
protected override List<SBInfo> SBInfos => m_SBInfos;
[Constructible]
public Miner() : base( "the miner" )

View file

@ -6,8 +6,8 @@ namespace Server.Mobiles
public class Monk : BaseVendor
{
private List<SBInfo> m_SBInfos = new List<SBInfo>();
protected override List<SBInfo> SBInfos{ get { return m_SBInfos; } }
protected override List<SBInfo> SBInfos => m_SBInfos;
[Constructible]
public Monk() : base( "the Monk" )
{

View file

@ -5,7 +5,7 @@ namespace Server.Mobiles
public class Provisioner : BaseVendor
{
private List<SBInfo> m_SBInfos = new List<SBInfo>();
protected override List<SBInfo> SBInfos{ get { return m_SBInfos; } }
protected override List<SBInfo> SBInfos => m_SBInfos;
[Constructible]
public Provisioner() : base( "the provisioner" )

View file

@ -5,7 +5,7 @@ namespace Server.Mobiles
public class Rancher : BaseVendor
{
private List<SBInfo> m_SBInfos = new List<SBInfo>();
protected override List<SBInfo> SBInfos{ get { return m_SBInfos; } }
protected override List<SBInfo> SBInfos => m_SBInfos;
[Constructible]
public Rancher() : base( "the rancher" )

View file

@ -5,7 +5,7 @@ namespace Server.Mobiles
public class Ranger : BaseVendor
{
private List<SBInfo> m_SBInfos = new List<SBInfo>();
protected override List<SBInfo> SBInfos{ get { return m_SBInfos; } }
protected override List<SBInfo> SBInfos => m_SBInfos;
[Constructible]
public Ranger() : base( "the ranger" )

View file

@ -10,7 +10,7 @@ namespace Server.Mobiles
public class RealEstateBroker : BaseVendor
{
private List<SBInfo> m_SBInfos = new List<SBInfo>();
protected override List<SBInfo> SBInfos{ get { return m_SBInfos; } }
protected override List<SBInfo> SBInfos => m_SBInfos;
[Constructible]
public RealEstateBroker() : base( "the real estate broker" )

View file

@ -6,7 +6,7 @@ namespace Server.Mobiles
public class Scribe : BaseVendor
{
private List<SBInfo> m_SBInfos = new List<SBInfo>();
protected override List<SBInfo> SBInfos{ get { return m_SBInfos; } }
protected override List<SBInfo> SBInfos => m_SBInfos;
public override NpcGuild NpcGuild => NpcGuild.MagesGuild;
@ -25,10 +25,7 @@ namespace Server.Mobiles
m_SBInfos.Add( new SBScribe() );
}
public override VendorShoeType ShoeType
{
get{ return Utility.RandomBool() ? VendorShoeType.Shoes : VendorShoeType.Sandals; }
}
public override VendorShoeType ShoeType => Utility.RandomBool() ? VendorShoeType.Shoes : VendorShoeType.Sandals;
public override void InitOutfit()
{

View file

@ -5,7 +5,7 @@ namespace Server.Mobiles
public class Shipwright : BaseVendor
{
private List<SBInfo> m_SBInfos = new List<SBInfo>();
protected override List<SBInfo> SBInfos{ get { return m_SBInfos; } }
protected override List<SBInfo> SBInfos => m_SBInfos;
[Constructible]
public Shipwright() : base( "the shipwright" )

View file

@ -6,7 +6,7 @@ namespace Server.Mobiles
public class StoneCrafter : BaseVendor
{
private List<SBInfo> m_SBInfos = new List<SBInfo>();
protected override List<SBInfo> SBInfos{ get { return m_SBInfos; } }
protected override List<SBInfo> SBInfos => m_SBInfos;
public override NpcGuild NpcGuild => NpcGuild.TinkersGuild;

View file

@ -7,7 +7,7 @@ namespace Server.Mobiles
public class Tailor : BaseVendor
{
private List<SBInfo> m_SBInfos = new List<SBInfo>();
protected override List<SBInfo> SBInfos{ get { return m_SBInfos; } }
protected override List<SBInfo> SBInfos => m_SBInfos;
public override NpcGuild NpcGuild => NpcGuild.TailorsGuild;
@ -22,10 +22,7 @@ namespace Server.Mobiles
m_SBInfos.Add( new SBTailor() );
}
public override VendorShoeType ShoeType
{
get{ return Utility.RandomBool() ? VendorShoeType.Sandals : VendorShoeType.Shoes; }
}
public override VendorShoeType ShoeType => Utility.RandomBool() ? VendorShoeType.Sandals : VendorShoeType.Shoes;
#region Bulk Orders
public override Item CreateBulkOrder( Mobile from, bool fromContextMenu )

View file

@ -5,7 +5,7 @@ namespace Server.Mobiles
public class Tanner : BaseVendor
{
private List<SBInfo> m_SBInfos = new List<SBInfo>();
protected override List<SBInfo> SBInfos{ get { return m_SBInfos; } }
protected override List<SBInfo> SBInfos => m_SBInfos;
[Constructible]
public Tanner() : base( "the tanner" )

View file

@ -5,7 +5,7 @@ namespace Server.Mobiles
public class TavernKeeper : BaseVendor
{
private List<SBInfo> m_SBInfos = new List<SBInfo>();
protected override List<SBInfo> SBInfos{ get { return m_SBInfos; } }
protected override List<SBInfo> SBInfos => m_SBInfos;
[Constructible]
public TavernKeeper() : base( "the tavern keeper" )

View file

@ -5,7 +5,7 @@ namespace Server.Mobiles
public class Thief : BaseVendor
{
private List<SBInfo> m_SBInfos = new List<SBInfo>();
protected override List<SBInfo> SBInfos{ get { return m_SBInfos; } }
protected override List<SBInfo> SBInfos => m_SBInfos;
[Constructible]
public Thief() : base( "the thief" )

View file

@ -5,7 +5,7 @@ namespace Server.Mobiles
public class Tinker : BaseVendor
{
private List<SBInfo> m_SBInfos = new List<SBInfo>();
protected override List<SBInfo> SBInfos{ get { return m_SBInfos; } }
protected override List<SBInfo> SBInfos => m_SBInfos;
public override NpcGuild NpcGuild => NpcGuild.TinkersGuild;

View file

@ -6,7 +6,7 @@ namespace Server.Mobiles
public class Vagabond : BaseVendor
{
private List<SBInfo> m_SBInfos = new List<SBInfo>();
protected override List<SBInfo> SBInfos{ get { return m_SBInfos; } }
protected override List<SBInfo> SBInfos => m_SBInfos;
[Constructible]
public Vagabond() : base( "the vagabond" )

View file

@ -5,7 +5,7 @@ namespace Server.Mobiles
public class VarietyDealer : BaseVendor
{
private List<SBInfo> m_SBInfos = new List<SBInfo>();
protected override List<SBInfo> SBInfos{ get { return m_SBInfos; } }
protected override List<SBInfo> SBInfos => m_SBInfos;
[Constructible]
public VarietyDealer() : base( "the variety dealer" )

View file

@ -5,7 +5,7 @@ namespace Server.Mobiles
public class Veterinarian : BaseVendor
{
private List<SBInfo> m_SBInfos = new List<SBInfo>();
protected override List<SBInfo> SBInfos{ get { return m_SBInfos; } }
protected override List<SBInfo> SBInfos => m_SBInfos;
[Constructible]
public Veterinarian() : base( "the vet" )

View file

@ -5,7 +5,7 @@ namespace Server.Mobiles
public class Waiter : BaseVendor
{
private List<SBInfo> m_SBInfos = new List<SBInfo>();
protected override List<SBInfo> SBInfos{ get { return m_SBInfos; } }
protected override List<SBInfo> SBInfos => m_SBInfos;
[Constructible]
public Waiter() : base( "the waiter" )

View file

@ -7,7 +7,7 @@ namespace Server.Mobiles
public class Weaponsmith : BaseVendor
{
private List<SBInfo> m_SBInfos = new List<SBInfo>();
protected override List<SBInfo> SBInfos{ get { return m_SBInfos; } }
protected override List<SBInfo> SBInfos => m_SBInfos;
[Constructible]
public Weaponsmith() : base( "the weaponsmith" )
@ -28,10 +28,7 @@ namespace Server.Mobiles
m_SBInfos.Add( new SBSEWeapons() );
}
public override VendorShoeType ShoeType
{
get{ return Utility.RandomBool() ? VendorShoeType.Boots : VendorShoeType.ThighBoots; }
}
public override VendorShoeType ShoeType => Utility.RandomBool() ? VendorShoeType.Boots : VendorShoeType.ThighBoots;
public override int GetShoeHue()
{

View file

@ -7,7 +7,7 @@ namespace Server.Mobiles
public class Weaver : BaseVendor
{
private List<SBInfo> m_SBInfos = new List<SBInfo>();
protected override List<SBInfo> SBInfos{ get { return m_SBInfos; } }
protected override List<SBInfo> SBInfos => m_SBInfos;
public override NpcGuild NpcGuild => NpcGuild.TailorsGuild;
@ -22,10 +22,7 @@ namespace Server.Mobiles
m_SBInfos.Add( new SBWeaver() );
}
public override VendorShoeType ShoeType
{
get{ return VendorShoeType.Sandals; }
}
public override VendorShoeType ShoeType => VendorShoeType.Sandals;
#region Bulk Orders
public override Item CreateBulkOrder( Mobile from, bool fromContextMenu )

View file

@ -87,8 +87,12 @@ namespace Server.Mobiles
private string m_Message;
private string m_Keyword;
public string Message{ get{ return m_Message; } set{ m_Message = value; } }
public string Keyword{ get{ return m_Keyword; } set{ m_Keyword = value; } }
public string Message{ get => m_Message;
set => m_Message = value;
}
public string Keyword{ get => m_Keyword;
set => m_Keyword = value;
}
public BarkeeperRumor( string message, string keyword )
{
@ -147,13 +151,13 @@ namespace Server.Mobiles
[CommandProperty( AccessLevel.GameMaster )]
public Mobile Owner
{
get{ return m_Owner; }
set{ m_Owner = value; }
get => m_Owner;
set => m_Owner = value;
}
public BaseHouse House
{
get{ return m_House; }
get => m_House;
set
{
if ( m_House != null )
@ -169,8 +173,8 @@ namespace Server.Mobiles
[CommandProperty( AccessLevel.GameMaster )]
public string TipMessage
{
get{ return m_TipMessage; }
set{ m_TipMessage = value; }
get => m_TipMessage;
set => m_TipMessage = value;
}
public override bool IsActiveBuyer => false;
@ -179,7 +183,7 @@ namespace Server.Mobiles
public override bool DisallowAllMoves => true;
public override bool NoHouseRestrictions => true;
public BarkeeperRumor[] Rumors{ get{ return m_Rumors; } }
public BarkeeperRumor[] Rumors => m_Rumors;
public override VendorShoeType ShoeType => Utility.RandomBool() ? VendorShoeType.ThighBoots : VendorShoeType.Boots;
@ -488,7 +492,7 @@ namespace Server.Mobiles
}
private List<SBInfo> m_SBInfos = new List<SBInfo>();
protected override List<SBInfo> SBInfos{ get { return m_SBInfos; } }
protected override List<SBInfo> SBInfos => m_SBInfos;
public override void InitSBInfo()
{

View file

@ -28,8 +28,8 @@ namespace Server.Mobiles
private bool m_Valid;
public Item Item{ get{ return m_Item; } }
public int Price{ get{ return m_Price; } }
public Item Item => m_Item;
public int Price => m_Price;
public string FormattedPrice
{
@ -44,7 +44,7 @@ namespace Server.Mobiles
public string Description
{
get{ return m_Description; }
get => m_Description;
set
{
if ( value != null )
@ -57,12 +57,12 @@ namespace Server.Mobiles
}
}
public DateTime Created{ get{ return m_Created; } }
public DateTime Created => m_Created;
public bool IsForSale{ get{ return Price >= 0; } }
public bool IsForFree{ get{ return Price == 0; } }
public bool IsForSale => Price >= 0;
public bool IsForFree => Price == 0;
public bool Valid{ get{ return m_Valid; } }
public bool Valid => m_Valid;
public VendorItem( Item item, int price, string description, DateTime created )
{
@ -511,28 +511,28 @@ namespace Server.Mobiles
[CommandProperty( AccessLevel.GameMaster )]
public Mobile Owner
{
get{ return m_Owner; }
set{ m_Owner = value; }
get => m_Owner;
set => m_Owner = value;
}
[CommandProperty( AccessLevel.GameMaster )]
public int BankAccount
{
get{ return m_BankAccount; }
set{ m_BankAccount = value; }
get => m_BankAccount;
set => m_BankAccount = value;
}
[CommandProperty( AccessLevel.GameMaster )]
public int HoldGold
{
get{ return m_HoldGold; }
set{ m_HoldGold = value; }
get => m_HoldGold;
set => m_HoldGold = value;
}
[CommandProperty( AccessLevel.GameMaster )]
public string ShopName
{
get{ return m_ShopName; }
get => m_ShopName;
set
{
if ( value == null )
@ -545,20 +545,17 @@ namespace Server.Mobiles
}
[CommandProperty( AccessLevel.GameMaster )]
public DateTime NextPayTime
{
get{ return m_NextPayTime; }
}
public DateTime NextPayTime => m_NextPayTime;
public PlayerVendorPlaceholder Placeholder
{
get{ return m_Placeholder; }
set{ m_Placeholder = value; }
get => m_Placeholder;
set => m_Placeholder = value;
}
public BaseHouse House
{
get{ return m_House; }
get => m_House;
set
{
if ( m_House != null )
@ -1661,7 +1658,7 @@ namespace Server.Mobiles
private ExpireTimer m_Timer;
[CommandProperty( AccessLevel.GameMaster )]
public PlayerVendor Vendor{ get{ return m_Vendor; } }
public PlayerVendor Vendor => m_Vendor;
public PlayerVendorPlaceholder( PlayerVendor vendor ) : base( 0x1F28 )
{

View file

@ -21,8 +21,8 @@ namespace Server.Mobiles
private TimeSpan m_Duration;
private int m_Name;
public TimeSpan Duration{ get{ return m_Duration; } }
public int Name{ get{ return m_Name; } }
public TimeSpan Duration => m_Duration;
public int Name => m_Name;
public int ID
{
@ -76,57 +76,48 @@ namespace Server.Mobiles
{
}
public VendorRentalDuration RentalDuration
{
get{ return m_RentalDuration; }
}
public VendorRentalDuration RentalDuration => m_RentalDuration;
[CommandProperty( AccessLevel.GameMaster )]
public int RentalPrice
{
get{ return m_RentalPrice; }
set{ m_RentalPrice = value; }
get => m_RentalPrice;
set => m_RentalPrice = value;
}
[CommandProperty( AccessLevel.GameMaster )]
public bool LandlordRenew
{
get{ return m_LandlordRenew; }
set{ m_LandlordRenew = value; }
get => m_LandlordRenew;
set => m_LandlordRenew = value;
}
[CommandProperty( AccessLevel.GameMaster )]
public bool RenterRenew
{
get{ return m_RenterRenew; }
set{ m_RenterRenew = value; }
get => m_RenterRenew;
set => m_RenterRenew = value;
}
[CommandProperty( AccessLevel.GameMaster )]
public bool Renew
{
get{ return LandlordRenew && RenterRenew && House != null && House.DecayType != DecayType.Condemned; }
}
public bool Renew => LandlordRenew && RenterRenew && House != null && House.DecayType != DecayType.Condemned;
[CommandProperty( AccessLevel.GameMaster )]
public int RenewalPrice
{
get{ return m_RenewalPrice; }
set{ m_RenewalPrice = value; }
get => m_RenewalPrice;
set => m_RenewalPrice = value;
}
[CommandProperty( AccessLevel.GameMaster )]
public int RentalGold
{
get{ return m_RentalGold; }
set{ m_RentalGold = value; }
get => m_RentalGold;
set => m_RentalGold = value;
}
[CommandProperty( AccessLevel.GameMaster )]
public DateTime RentalExpireTime
{
get{ return m_RentalExpireTime; }
}
public DateTime RentalExpireTime => m_RentalExpireTime;
public override bool IsOwner( Mobile m )
{

View file

@ -35,43 +35,37 @@ namespace Server.Mobiles
public BaseHouse House
{
get{ return m_House; }
set{ m_House = value; }
get => m_House;
set => m_House = value;
}
public string VendorName
{
get{ return m_VendorName; }
set{ m_VendorName = value; }
get => m_VendorName;
set => m_VendorName = value;
}
public string ShopName
{
get{ return m_ShopName; }
set{ m_ShopName = value; }
get => m_ShopName;
set => m_ShopName = value;
}
public Mobile Owner
{
get{ return m_Owner; }
set{ m_Owner = value; }
get => m_Owner;
set => m_Owner = value;
}
public List<Item> Items
{
get{ return m_Items; }
}
public List<Item> Items => m_Items;
public int Gold
{
get{ return m_Gold; }
set{ m_Gold = value; }
get => m_Gold;
set => m_Gold = value;
}
public DateTime ExpireTime
{
get{ return m_ExpireTime; }
}
public DateTime ExpireTime => m_ExpireTime;
public void AddItem( Item item )
{