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

6
Scripts/Mobiles/Vendors/AnimalBuy.cs
View file

@ -4,17 +4,15 @@ namespace Server.Mobiles
{
public class AnimalBuyInfo : GenericBuyInfo
{
private int m_ControlSlots;
public AnimalBuyInfo( int controlSlots, Type type, int price, int amount, int itemID, int hue ) : this( controlSlots, null, type, price, amount, itemID, hue )
{
}
public AnimalBuyInfo( int controlSlots, string name, Type type, int price, int amount, int itemID, int hue ) : base( name, type, price, amount, itemID, hue )
{
m_ControlSlots = controlSlots;
ControlSlots = controlSlots;
}
public override int ControlSlots => m_ControlSlots;
public override int ControlSlots { get; }
}
}

22
Scripts/Mobiles/Vendors/BaseVendor.cs
View file

@ -30,10 +30,6 @@ namespace Server.Mobiles
private ArrayList m_ArmorBuyInfo = new ArrayList();
private ArrayList m_ArmorSellInfo = new ArrayList();
private DateTime m_LastRestock;
private DateTime m_NextTrickOrTreat;
public override bool CanTeach => true;
public override bool BardImmune => true;
@ -48,9 +44,7 @@ namespace Server.Mobiles
public override bool IsInvulnerable => true;
public virtual DateTime NextTrickOrTreat { get => m_NextTrickOrTreat;
set => m_NextTrickOrTreat = value;
}
public virtual DateTime NextTrickOrTreat { get; set; }
public override bool ShowFameTitle => false;
@ -178,7 +172,7 @@ namespace Server.Mobiles
pack.Visible = false;
AddItem( pack );
m_LastRestock = DateTime.UtcNow;
LastRestock = DateTime.UtcNow;
}
public BaseVendor( Serial serial )
@ -186,11 +180,7 @@ namespace Server.Mobiles
{
}
public DateTime LastRestock
{
get => m_LastRestock;
set => m_LastRestock = value;
}
public DateTime LastRestock { get; set; }
public virtual TimeSpan RestockDelay => TimeSpan.FromHours( 1 );
@ -214,7 +204,7 @@ namespace Server.Mobiles
protected void LoadSBInfo()
{
m_LastRestock = DateTime.UtcNow;
LastRestock = DateTime.UtcNow;
for ( int i = 0; i < m_ArmorBuyInfo.Count; ++i )
{
@ -491,7 +481,7 @@ namespace Server.Mobiles
public virtual void Restock()
{
m_LastRestock = DateTime.UtcNow;
LastRestock = DateTime.UtcNow;
IBuyItemInfo[] buyInfo = GetBuyInfo();
@ -515,7 +505,7 @@ namespace Server.Mobiles
return;
}
if ( DateTime.UtcNow - m_LastRestock > RestockDelay )
if ( DateTime.UtcNow - LastRestock > RestockDelay )
Restock();
UpdateBuyInfo();

91
Scripts/Mobiles/Vendors/GenericBuy.cs
View file

@ -101,13 +101,8 @@ namespace Server.Mobiles
}
}
private Type m_Type;
private string m_Name;
private int m_Price;
private int m_MaxAmount, m_Amount;
private int m_ItemID;
private int m_Hue;
private object[] m_Args;
private int m_Amount;
private IEntity m_DisplayEntity;
public virtual int ControlSlots => 0;
@ -137,49 +132,39 @@ namespace Server.Mobiles
bool canCache = CanCacheDisplay;
if ( canCache )
m_DisplayEntity = DisplayCache.Cache.Lookup( m_Type );
m_DisplayEntity = DisplayCache.Cache.Lookup( Type );
if ( m_DisplayEntity == null || IsDeleted( m_DisplayEntity ) )
m_DisplayEntity = GetEntity();
DisplayCache.Cache.Store( m_Type, m_DisplayEntity, canCache );
DisplayCache.Cache.Store( Type, m_DisplayEntity, canCache );
return m_DisplayEntity;
}
public Type Type
{
get => m_Type;
set => m_Type = value;
}
public Type Type { get; set; }
public string Name
{
get => m_Name;
set => m_Name = value;
}
public string Name { get; set; }
public int DefaultPrice => m_PriceScalar;
private int m_PriceScalar;
public int DefaultPrice { get; private set; }
public int PriceScalar
{
get => m_PriceScalar;
set => m_PriceScalar = value;
get => DefaultPrice;
set => DefaultPrice = value;
}
public int Price
{
get
{
if ( m_PriceScalar != 0 )
if ( DefaultPrice != 0 )
{
if ( m_Price > 5000000 )
{
long price = m_Price;
price *= m_PriceScalar;
price *= DefaultPrice;
price += 50;
price /= 100;
@ -189,7 +174,7 @@ namespace Server.Mobiles
return (int)price;
}
return ( ((m_Price * m_PriceScalar) + 50) / 100 );
return ( ((m_Price * DefaultPrice) + 50) / 100 );
}
return m_Price;
@ -197,17 +182,9 @@ namespace Server.Mobiles
set => m_Price = value;
}
public int ItemID
{
get => m_ItemID;
set => m_ItemID = value;
}
public int ItemID { get; set; }
public int Hue
{
get => m_Hue;
set => m_Hue = value;
}
public int Hue { get; set; }
public int Amount
{
@ -215,17 +192,9 @@ namespace Server.Mobiles
set{ if ( value < 0 ) value = 0; m_Amount = value; }
}
public int MaxAmount
{
get => m_MaxAmount;
set => m_MaxAmount = value;
}
public int MaxAmount { get; set; }
public object[] Args
{
get => m_Args;
set => m_Args = value;
}
public object[] Args { get; set; }
public GenericBuyInfo( Type type, int price, int amount, int itemID, int hue ) : this( null, type, price, amount, itemID, hue, null )
{
@ -241,26 +210,26 @@ namespace Server.Mobiles
public GenericBuyInfo( string name, Type type, int price, int amount, int itemID, int hue, object[] args )
{
m_Type = type;
Type = type;
m_Price = price;
m_MaxAmount = m_Amount = amount;
m_ItemID = itemID;
m_Hue = hue;
m_Args = args;
MaxAmount = m_Amount = amount;
ItemID = itemID;
Hue = hue;
Args = args;
if ( name == null )
m_Name = itemID < 0x4000 ? (1020000 + itemID).ToString() : (1078872 + itemID).ToString();
Name = itemID < 0x4000 ? (1020000 + itemID).ToString() : (1078872 + itemID).ToString();
else
m_Name = name;
Name = name;
}
//get a new instance of an object (we just bought it)
public virtual IEntity GetEntity()
{
if ( m_Args == null || m_Args.Length == 0 )
return (IEntity)Activator.CreateInstance( m_Type );
if ( Args == null || Args.Length == 0 )
return (IEntity)Activator.CreateInstance( Type );
return (IEntity)Activator.CreateInstance( m_Type, m_Args );
return (IEntity)Activator.CreateInstance( Type, Args );
//return (Item)Activator.CreateInstance( m_Type );
}
@ -311,11 +280,11 @@ namespace Server.Mobiles
if ( Core.ML && Obj_Disp is Item && !( Obj_Disp as Item ).Stackable )
{
m_MaxAmount = Math.Min( 20, m_MaxAmount );
MaxAmount = Math.Min( 20, MaxAmount );
}
else
{
m_MaxAmount = Math.Min( 999, m_MaxAmount * 2 );
MaxAmount = Math.Min( 999, MaxAmount * 2 );
}
}
else
@ -326,7 +295,7 @@ namespace Server.Mobiles
* there's clearly a demand and we should not cut down on the stock.
*/
int halfQuantity = m_MaxAmount;
int halfQuantity = MaxAmount;
if ( halfQuantity >= 999 )
halfQuantity = 640;
@ -334,10 +303,10 @@ namespace Server.Mobiles
halfQuantity /= 2;
if ( m_Amount >= halfQuantity )
m_MaxAmount = halfQuantity;
MaxAmount = halfQuantity;
}
m_Amount = m_MaxAmount;
m_Amount = MaxAmount;
}
}
}

82
Scripts/Mobiles/Vendors/NPC/CustomHairstylist.cs
View file

@ -7,8 +7,7 @@ namespace Server.Mobiles
{
public class CustomHairstylist : BaseVendor
{
private List<SBInfo> m_SBInfos = new List<SBInfo>();
protected override List<SBInfo> SBInfos => m_SBInfos;
protected override List<SBInfo> SBInfos { get; } = new List<SBInfo>();
public override bool ClickTitle => false;
@ -92,36 +91,34 @@ namespace Server.Mobiles
public class HairstylistBuyInfo
{
private int m_Title;
private string m_TitleString;
private int m_Price;
private bool m_FacialHair;
private Type m_GumpType;
private object[] m_GumpArgs;
public int Title { get; }
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 string TitleString { get; }
public int Price { get; }
public bool FacialHair { get; }
public Type GumpType { get; }
public object[] GumpArgs { get; }
public HairstylistBuyInfo( int title, int price, bool facialHair, Type gumpType, object[] args )
{
m_Title = title;
m_Price = price;
m_FacialHair = facialHair;
m_GumpType = gumpType;
m_GumpArgs = args;
Title = title;
Price = price;
FacialHair = facialHair;
GumpType = gumpType;
GumpArgs = args;
}
public HairstylistBuyInfo( string title, int price, bool facialHair, Type gumpType, object[] args )
{
m_TitleString = title;
m_Price = price;
m_FacialHair = facialHair;
m_GumpType = gumpType;
m_GumpArgs = args;
TitleString = title;
Price = price;
FacialHair = facialHair;
GumpType = gumpType;
GumpArgs = args;
}
}
@ -229,26 +226,24 @@ namespace Server.Mobiles
public class ChangeHairHueEntry
{
private string m_Name;
private int[] m_Hues;
public string Name { get; }
public string Name => m_Name;
public int[] Hues => m_Hues;
public int[] Hues { get; }
public ChangeHairHueEntry( string name, int[] hues )
{
m_Name = name;
m_Hues = hues;
Name = name;
Hues = hues;
}
public ChangeHairHueEntry( string name, int start, int count )
{
m_Name = name;
Name = name;
m_Hues = new int[count];
Hues = new int[count];
for ( int i = 0; i < count; ++i )
m_Hues[i] = start + i;
Hues[i] = start + i;
}
public static readonly ChangeHairHueEntry[] BrightEntries = {
@ -386,21 +381,20 @@ namespace Server.Mobiles
public class ChangeHairstyleEntry
{
private int m_ItemID;
private int m_GumpID;
private int m_X, m_Y;
public int ItemID { get; }
public int ItemID => m_ItemID;
public int GumpID => m_GumpID;
public int X => m_X;
public int Y => m_Y;
public int GumpID { get; }
public int X { get; }
public int Y { get; }
public ChangeHairstyleEntry( int gumpID, int x, int y, int itemID )
{
m_GumpID = gumpID;
m_X = x;
m_Y = y;
m_ItemID = itemID;
GumpID = gumpID;
X = x;
Y = y;
ItemID = itemID;
}
public static readonly ChangeHairstyleEntry[] HairEntries = {

3
Scripts/Mobiles/Vendors/NPC/Guildmasters/BaseGuildmaster.cs
View file

@ -7,8 +7,7 @@ namespace Server.Mobiles
{
public abstract class BaseGuildmaster : BaseVendor
{
private List<SBInfo> m_SBInfos = new List<SBInfo>();
protected override List<SBInfo> SBInfos => m_SBInfos;
protected override List<SBInfo> SBInfos { get; } = new List<SBInfo>();
public override bool IsActiveVendor => false;

94
Scripts/Mobiles/Vendors/PlayerBarkeeper.cs
View file

@ -84,20 +84,14 @@ namespace Server.Mobiles
public class BarkeeperRumor
{
private string m_Message;
private string m_Keyword;
public string Message { get; set; }
public string Message{ get => m_Message;
set => m_Message = value;
}
public string Keyword{ get => m_Keyword;
set => m_Keyword = value;
}
public string Keyword { get; set; }
public BarkeeperRumor( string message, string keyword )
{
m_Message = message;
m_Keyword = keyword;
Message = message;
Keyword = keyword;
}
public static BarkeeperRumor Deserialize( GenericReader reader )
@ -117,8 +111,8 @@ namespace Server.Mobiles
else
{
writer.Write( true );
writer.Write( rumor.m_Message );
writer.Write( rumor.m_Keyword );
writer.Write( rumor.Message );
writer.Write( rumor.Keyword );
}
}
}
@ -142,18 +136,10 @@ namespace Server.Mobiles
public class PlayerBarkeeper : BaseVendor
{
private Mobile m_Owner;
private BaseHouse m_House;
private string m_TipMessage;
private BarkeeperRumor[] m_Rumors;
[CommandProperty( AccessLevel.GameMaster )]
public Mobile Owner
{
get => m_Owner;
set => m_Owner = value;
}
public Mobile Owner { get; set; }
public BaseHouse House
{
@ -169,11 +155,7 @@ namespace Server.Mobiles
}
[CommandProperty( AccessLevel.GameMaster )]
public string TipMessage
{
get => m_TipMessage;
set => m_TipMessage = value;
}
public string TipMessage { get; set; }
public override bool IsActiveBuyer => false;
public override bool IsActiveSeller => ( m_SBInfos.Count > 0 );
@ -181,7 +163,7 @@ namespace Server.Mobiles
public override bool DisallowAllMoves => true;
public override bool NoHouseRestrictions => true;
public BarkeeperRumor[] Rumors => m_Rumors;
public BarkeeperRumor[] Rumors { get; private set; }
public override VendorShoeType ShoeType => Utility.RandomBool() ? VendorShoeType.ThighBoots : VendorShoeType.Boots;
@ -217,9 +199,9 @@ namespace Server.Mobiles
public PlayerBarkeeper( Mobile owner, BaseHouse house ) : base( "the barkeeper" )
{
m_Owner = owner;
Owner = owner;
House = house;
m_Rumors = new BarkeeperRumor[3];
Rumors = new BarkeeperRumor[3];
LoadSBInfo();
}
@ -295,9 +277,9 @@ namespace Server.Mobiles
}
}
for ( int i = 0; i < m_Rumors.Length; ++i )
for ( int i = 0; i < Rumors.Length; ++i )
{
BarkeeperRumor rumor = m_Rumors[i];
BarkeeperRumor rumor = Rumors[i];
string keyword = rumor?.Keyword;
@ -329,7 +311,7 @@ namespace Server.Mobiles
}
else
{
string tip = m_TipMessage;
string tip = TipMessage;
if ( tip == null || (tip = tip.Trim()).Length == 0 )
{
@ -357,7 +339,7 @@ namespace Server.Mobiles
if ( from.AccessLevel > AccessLevel.GameMaster )
return true;
return ( m_Owner == from );
return ( Owner == from );
}
public override void GetContextMenuEntries( Mobile from, List<ContextMenuEntry> list )
@ -383,7 +365,7 @@ namespace Server.Mobiles
public void BeginChangeRumor( Mobile from, int index )
{
if ( index < 0 || index >= m_Rumors.Length )
if ( index < 0 || index >= Rumors.Length )
return;
from.Prompt = new ChangeRumorMessagePrompt( this, index );
@ -392,13 +374,13 @@ namespace Server.Mobiles
public void EndChangeRumor( Mobile from, int index, string text )
{
if ( index < 0 || index >= m_Rumors.Length )
if ( index < 0 || index >= Rumors.Length )
return;
if ( m_Rumors[index] == null )
m_Rumors[index] = new BarkeeperRumor( text, null );
if ( Rumors[index] == null )
Rumors[index] = new BarkeeperRumor( text, null );
else
m_Rumors[index].Message = text;
Rumors[index].Message = text;
from.Prompt = new ChangeRumorKeywordPrompt( this, index );
PrivateOverheadMessage( MessageType.Regular, 0x3B2, false, "What keyword should a guest say to me to get this news?", from.NetState );
@ -406,23 +388,23 @@ namespace Server.Mobiles
public void EndChangeKeyword( Mobile from, int index, string text )
{
if ( index < 0 || index >= m_Rumors.Length )
if ( index < 0 || index >= Rumors.Length )
return;
if ( m_Rumors[index] == null )
m_Rumors[index] = new BarkeeperRumor( null, text );
if ( Rumors[index] == null )
Rumors[index] = new BarkeeperRumor( null, text );
else
m_Rumors[index].Keyword = text;
Rumors[index].Keyword = text;
PrivateOverheadMessage( MessageType.Regular, 0x3B2, false, "I'll pass on the message.", from.NetState );
}
public void RemoveRumor( Mobile from, int index )
{
if ( index < 0 || index >= m_Rumors.Length )
if ( index < 0 || index >= Rumors.Length )
return;
m_Rumors[index] = null;
Rumors[index] = null;
}
public void BeginChangeTip( Mobile from )
@ -433,13 +415,13 @@ namespace Server.Mobiles
public void EndChangeTip( Mobile from, string text )
{
m_TipMessage = text;
TipMessage = text;
PrivateOverheadMessage( MessageType.Regular, 0x3B2, false, "I'll say that to anyone who gives me a good tip.", from.NetState );
}
public void RemoveTip( Mobile from )
{
m_TipMessage = null;
TipMessage = null;
}
public void BeginChangeTitle( Mobile from )
@ -511,14 +493,14 @@ namespace Server.Mobiles
writer.Write( (Item) m_House );
writer.Write( (Mobile) m_Owner );
writer.Write( (Mobile) Owner );
writer.WriteEncodedInt( (int) m_Rumors.Length );
writer.WriteEncodedInt( (int) Rumors.Length );
for ( int i = 0; i < m_Rumors.Length; ++i )
BarkeeperRumor.Serialize( writer, m_Rumors[i] );
for ( int i = 0; i < Rumors.Length; ++i )
BarkeeperRumor.Serialize( writer, Rumors[i] );
writer.Write( (string) m_TipMessage );
writer.Write( (string) TipMessage );
}
public override void Deserialize( GenericReader reader )
@ -537,14 +519,14 @@ namespace Server.Mobiles
}
case 0:
{
m_Owner = reader.ReadMobile();
Owner = reader.ReadMobile();
m_Rumors = new BarkeeperRumor[reader.ReadEncodedInt()];
Rumors = new BarkeeperRumor[reader.ReadEncodedInt()];
for ( int i = 0; i < m_Rumors.Length; ++i )
m_Rumors[i] = BarkeeperRumor.Deserialize( reader );
for ( int i = 0; i < Rumors.Length; ++i )
Rumors[i] = BarkeeperRumor.Deserialize( reader );
m_TipMessage = reader.ReadString();
TipMessage = reader.ReadString();
break;
}

114
Scripts/Mobiles/Vendors/PlayerVendor.cs
View file

@ -21,24 +21,20 @@ namespace Server.Mobiles
public class VendorItem
{
private Item m_Item;
private int m_Price;
private string m_Description;
private DateTime m_Created;
private bool m_Valid;
public Item Item { get; }
public Item Item => m_Item;
public int Price => m_Price;
public int Price { get; }
public string FormattedPrice
{
get
{
if ( Core.ML )
return m_Price.ToString( "N0", CultureInfo.GetCultureInfo( "en-US" ) );
return Price.ToString( "N0", CultureInfo.GetCultureInfo( "en-US" ) );
return m_Price.ToString();
return Price.ToString();
}
}
@ -57,31 +53,31 @@ namespace Server.Mobiles
}
}
public DateTime Created => m_Created;
public DateTime Created { get; }
public bool IsForSale => Price >= 0;
public bool IsForFree => Price == 0;
public bool Valid => m_Valid;
public bool Valid { get; private set; }
public VendorItem( Item item, int price, string description, DateTime created )
{
m_Item = item;
m_Price = price;
Item = item;
Price = price;
if ( description != null )
m_Description = description;
else
m_Description = "";
m_Created = created;
Created = created;
m_Valid = true;
Valid = true;
}
public void Invalidate()
{
m_Valid = false;
Valid = false;
}
}
@ -269,18 +265,11 @@ namespace Server.Mobiles
{
private Dictionary<Item, VendorItem> m_SellItems;
private Mobile m_Owner;
private BaseHouse m_House;
private int m_BankAccount;
private int m_HoldGold;
private string m_ShopName;
private Timer m_PayTimer;
private DateTime m_NextPayTime;
private PlayerVendorPlaceholder m_Placeholder;
public PlayerVendor( Mobile owner, BaseHouse house )
{
@ -289,13 +278,13 @@ namespace Server.Mobiles
if ( BaseHouse.NewVendorSystem )
{
m_BankAccount = 0;
m_HoldGold = 4;
BankAccount = 0;
HoldGold = 4;
}
else
{
m_BankAccount = 1000;
m_HoldGold = 0;
BankAccount = 1000;
HoldGold = 0;
}
ShopName = "Shop Not Yet Named";
@ -316,7 +305,7 @@ namespace Server.Mobiles
m_PayTimer = new PayTimer( this, delay );
m_PayTimer.Start();
m_NextPayTime = DateTime.UtcNow + delay;
NextPayTime = DateTime.UtcNow + delay;
}
public PlayerVendor( Serial serial ) : base( serial )
@ -331,12 +320,12 @@ namespace Server.Mobiles
writer.Write( (bool) BaseHouse.NewVendorSystem );
writer.Write( (string) m_ShopName );
writer.WriteDeltaTime( (DateTime) m_NextPayTime );
writer.WriteDeltaTime( (DateTime) NextPayTime );
writer.Write( (Item) House );
writer.Write( (Mobile) m_Owner );
writer.Write( (int) m_BankAccount );
writer.Write( (int) m_HoldGold );
writer.Write( (Mobile) Owner );
writer.Write( (int) BankAccount );
writer.Write( (int) HoldGold );
writer.Write( (int) m_SellItems.Count );
foreach ( VendorItem vi in m_SellItems.Values )
@ -364,16 +353,16 @@ namespace Server.Mobiles
{
newVendorSystem = reader.ReadBool();
m_ShopName = reader.ReadString();
m_NextPayTime = reader.ReadDeltaTime();
NextPayTime = reader.ReadDeltaTime();
House = (BaseHouse) reader.ReadItem();
goto case 0;
}
case 0:
{
m_Owner = reader.ReadMobile();
m_BankAccount = reader.ReadInt();
m_HoldGold = reader.ReadInt();
Owner = reader.ReadMobile();
BankAccount = reader.ReadInt();
HoldGold = reader.ReadInt();
int count = reader.ReadInt();
@ -415,19 +404,19 @@ namespace Server.Mobiles
Timer.DelayCall( TimeSpan.Zero, FixDresswear );
}
m_NextPayTime = DateTime.UtcNow + PayTimer.GetInterval();
NextPayTime = DateTime.UtcNow + PayTimer.GetInterval();
if ( newVendorSystemActivated )
{
m_HoldGold += m_BankAccount;
m_BankAccount = 0;
HoldGold += BankAccount;
BankAccount = 0;
}
}
if ( version < 2 && RawStr == 75 && RawDex == 75 && RawInt == 75 )
InitStats( 100, 100, 25 );
TimeSpan delay = m_NextPayTime - DateTime.UtcNow;
TimeSpan delay = NextPayTime - DateTime.UtcNow;
m_PayTimer = new PayTimer( this, delay > TimeSpan.Zero ? delay : TimeSpan.Zero );
m_PayTimer.Start();
@ -503,25 +492,13 @@ namespace Server.Mobiles
}
[CommandProperty( AccessLevel.GameMaster )]
public Mobile Owner
{
get => m_Owner;
set => m_Owner = value;
}
public Mobile Owner { get; set; }
[CommandProperty( AccessLevel.GameMaster )]
public int BankAccount
{
get => m_BankAccount;
set => m_BankAccount = value;
}
public int BankAccount { get; set; }
[CommandProperty( AccessLevel.GameMaster )]
public int HoldGold
{
get => m_HoldGold;
set => m_HoldGold = value;
}
public int HoldGold { get; set; }
[CommandProperty( AccessLevel.GameMaster )]
public string ShopName
@ -539,13 +516,9 @@ namespace Server.Mobiles
}
[CommandProperty( AccessLevel.GameMaster )]
public DateTime NextPayTime => m_NextPayTime;
public DateTime NextPayTime { get; private set; }
public PlayerVendorPlaceholder Placeholder
{
get => m_Placeholder;
set => m_Placeholder = value;
}
public PlayerVendorPlaceholder Placeholder { get; set; }
public BaseHouse House
{
@ -1354,7 +1327,7 @@ namespace Server.Mobiles
protected override void OnTick()
{
m_Vendor.m_NextPayTime = DateTime.UtcNow + Interval;
m_Vendor.NextPayTime = DateTime.UtcNow + Interval;
int pay;
int totalGold;
@ -1624,18 +1597,17 @@ namespace Server.Mobiles
public class PlayerVendorPlaceholder : Item
{
private PlayerVendor m_Vendor;
private ExpireTimer m_Timer;
[CommandProperty( AccessLevel.GameMaster )]
public PlayerVendor Vendor => m_Vendor;
public PlayerVendor Vendor { get; private set; }
public PlayerVendorPlaceholder( PlayerVendor vendor ) : base( 0x1F28 )
{
Hue = 0x672;
Movable = false;
m_Vendor = vendor;
Vendor = vendor;
m_Timer = new ExpireTimer( this );
m_Timer.Start();
@ -1649,8 +1621,8 @@ namespace Server.Mobiles
{
base.GetProperties( list );
if ( m_Vendor != null )
list.Add( 1062498, m_Vendor.Name ); // reserved for vendor ~1_NAME~
if ( Vendor != null )
list.Add( 1062498, Vendor.Name ); // reserved for vendor ~1_NAME~
}
public void RestartTimer()
@ -1678,10 +1650,10 @@ namespace Server.Mobiles
public override void OnDelete()
{
if ( m_Vendor != null && !m_Vendor.Deleted )
if ( Vendor != null && !Vendor.Deleted )
{
m_Vendor.MoveToWorld( Location, Map );
m_Vendor.Placeholder = null;
Vendor.MoveToWorld( Location, Map );
Vendor.Placeholder = null;
}
}
@ -1691,7 +1663,7 @@ namespace Server.Mobiles
writer.WriteEncodedInt( (int) 0 );
writer.Write( (Mobile) m_Vendor );
writer.Write( (Mobile) Vendor );
}
public override void Deserialize( GenericReader reader )
@ -1700,7 +1672,7 @@ namespace Server.Mobiles
int version = reader.ReadEncodedInt();
m_Vendor = (PlayerVendor) reader.ReadMobile();
Vendor = (PlayerVendor) reader.ReadMobile();
Timer.DelayCall( TimeSpan.Zero, Delete );
}

99
Scripts/Mobiles/Vendors/RentedVendor.cs
View file

@ -17,11 +17,9 @@ namespace Server.Mobiles
new VendorRentalDuration( TimeSpan.FromDays( 28.0 ), 1062364 ) // 1 Month
};
private TimeSpan m_Duration;
private int m_Name;
public TimeSpan Duration { get; }
public TimeSpan Duration => m_Duration;
public int Name => m_Name;
public int Name { get; }
public int ID
{
@ -39,34 +37,25 @@ namespace Server.Mobiles
private VendorRentalDuration( TimeSpan duration, int name )
{
m_Duration = duration;
m_Name = name;
Duration = duration;
Name = name;
}
}
public class RentedVendor : PlayerVendor
{
private VendorRentalDuration m_RentalDuration;
private int m_RentalPrice;
private bool m_LandlordRenew;
private bool m_RenterRenew;
private int m_RenewalPrice;
private int m_RentalGold;
private DateTime m_RentalExpireTime;
private Timer m_RentalExpireTimer;
public RentedVendor( Mobile owner, BaseHouse house, VendorRentalDuration duration, int rentalPrice, bool landlordRenew, int rentalGold ) : base( owner, house )
{
m_RentalDuration = duration;
m_RentalPrice = m_RenewalPrice = rentalPrice;
m_LandlordRenew = landlordRenew;
m_RenterRenew = false;
RentalDuration = duration;
RentalPrice = RenewalPrice = rentalPrice;
LandlordRenew = landlordRenew;
RenterRenew = false;
m_RentalGold = rentalGold;
RentalGold = rentalGold;
m_RentalExpireTime = DateTime.UtcNow + duration.Duration;
RentalExpireTime = DateTime.UtcNow + duration.Duration;
m_RentalExpireTimer = new RentalExpireTimer( this, duration.Duration );
m_RentalExpireTimer.Start();
}
@ -75,48 +64,28 @@ namespace Server.Mobiles
{
}
public VendorRentalDuration RentalDuration => m_RentalDuration;
public VendorRentalDuration RentalDuration { get; private set; }
[CommandProperty( AccessLevel.GameMaster )]
public int RentalPrice
{
get => m_RentalPrice;
set => m_RentalPrice = value;
}
public int RentalPrice { get; set; }
[CommandProperty( AccessLevel.GameMaster )]
public bool LandlordRenew
{
get => m_LandlordRenew;
set => m_LandlordRenew = value;
}
public bool LandlordRenew { get; set; }
[CommandProperty( AccessLevel.GameMaster )]
public bool RenterRenew
{
get => m_RenterRenew;
set => m_RenterRenew = value;
}
public bool RenterRenew { get; set; }
[CommandProperty( AccessLevel.GameMaster )]
public bool Renew => LandlordRenew && RenterRenew && House != null && House.DecayType != DecayType.Condemned;
[CommandProperty( AccessLevel.GameMaster )]
public int RenewalPrice
{
get => m_RenewalPrice;
set => m_RenewalPrice = value;
}
public int RenewalPrice { get; set; }
[CommandProperty( AccessLevel.GameMaster )]
public int RentalGold
{
get => m_RentalGold;
set => m_RentalGold = value;
}
public int RentalGold { get; set; }
[CommandProperty( AccessLevel.GameMaster )]
public DateTime RentalExpireTime => m_RentalExpireTime;
public DateTime RentalExpireTime { get; private set; }
public override bool IsOwner( Mobile m )
{
@ -340,16 +309,16 @@ namespace Server.Mobiles
writer.WriteEncodedInt( 0 ); // version
writer.WriteEncodedInt( m_RentalDuration.ID );
writer.WriteEncodedInt( RentalDuration.ID );
writer.Write( (int) m_RentalPrice );
writer.Write( (bool) m_LandlordRenew );
writer.Write( (bool) m_RenterRenew );
writer.Write( (int) m_RenewalPrice );
writer.Write( (int) RentalPrice );
writer.Write( (bool) LandlordRenew );
writer.Write( (bool) RenterRenew );
writer.Write( (int) RenewalPrice );
writer.Write( (int) m_RentalGold );
writer.Write( (int) RentalGold );
writer.WriteDeltaTime( (DateTime) m_RentalExpireTime );
writer.WriteDeltaTime( (DateTime) RentalExpireTime );
}
public override void Deserialize( GenericReader reader )
@ -360,20 +329,20 @@ namespace Server.Mobiles
int durationID = reader.ReadEncodedInt();
if ( durationID < VendorRentalDuration.Instances.Length )
m_RentalDuration = VendorRentalDuration.Instances[durationID];
RentalDuration = VendorRentalDuration.Instances[durationID];
else
m_RentalDuration = VendorRentalDuration.Instances[0];
RentalDuration = VendorRentalDuration.Instances[0];
m_RentalPrice = reader.ReadInt();
m_LandlordRenew = reader.ReadBool();
m_RenterRenew = reader.ReadBool();
m_RenewalPrice = reader.ReadInt();
RentalPrice = reader.ReadInt();
LandlordRenew = reader.ReadBool();
RenterRenew = reader.ReadBool();
RenewalPrice = reader.ReadInt();
m_RentalGold = reader.ReadInt();
RentalGold = reader.ReadInt();
m_RentalExpireTime = reader.ReadDeltaTime();
RentalExpireTime = reader.ReadDeltaTime();
TimeSpan delay = m_RentalExpireTime - DateTime.UtcNow;
TimeSpan delay = RentalExpireTime - DateTime.UtcNow;
m_RentalExpireTimer = new RentalExpireTimer( this, delay > TimeSpan.Zero ? delay : TimeSpan.Zero );
m_RentalExpireTimer.Start();
}
@ -400,7 +369,7 @@ namespace Server.Mobiles
m_Vendor.RentalPrice = renewalPrice;
m_Vendor.m_RentalExpireTime = DateTime.UtcNow + m_Vendor.RentalDuration.Duration;
m_Vendor.RentalExpireTime = DateTime.UtcNow + m_Vendor.RentalDuration.Duration;
}
else
{

8
Scripts/Mobiles/Vendors/SBInfo/Armors/SBChainmailArmor.cs
View file

@ -5,15 +5,13 @@ namespace Server.Mobiles
{
public class SBChainmailArmor: SBInfo
{
private List<GenericBuyInfo> m_BuyInfo = new InternalBuyInfo();
private IShopSellInfo m_SellInfo = new InternalSellInfo();
public SBChainmailArmor()
{
}
public override IShopSellInfo SellInfo => m_SellInfo;
public override List<GenericBuyInfo> BuyInfo => m_BuyInfo;
public override IShopSellInfo SellInfo { get; } = new InternalSellInfo();
public override List<GenericBuyInfo> BuyInfo { get; } = new InternalBuyInfo();
public class InternalBuyInfo : List<GenericBuyInfo>
{

8
Scripts/Mobiles/Vendors/SBInfo/Armors/SBHelmetArmor.cs
View file

@ -5,15 +5,13 @@ namespace Server.Mobiles
{
public class SBHelmetArmor: SBInfo
{
private List<GenericBuyInfo> m_BuyInfo = new InternalBuyInfo();
private IShopSellInfo m_SellInfo = new InternalSellInfo();
public SBHelmetArmor()
{
}
public override IShopSellInfo SellInfo => m_SellInfo;
public override List<GenericBuyInfo> BuyInfo => m_BuyInfo;
public override IShopSellInfo SellInfo { get; } = new InternalSellInfo();
public override List<GenericBuyInfo> BuyInfo { get; } = new InternalBuyInfo();
public class InternalBuyInfo : List<GenericBuyInfo>
{

8
Scripts/Mobiles/Vendors/SBInfo/Armors/SBLeatherArmor.cs
View file

@ -5,15 +5,13 @@ namespace Server.Mobiles
{
public class SBLeatherArmor: SBInfo
{
private List<GenericBuyInfo> m_BuyInfo = new InternalBuyInfo();
private IShopSellInfo m_SellInfo = new InternalSellInfo();
public SBLeatherArmor()
{
}
public override IShopSellInfo SellInfo => m_SellInfo;
public override List<GenericBuyInfo> BuyInfo => m_BuyInfo;
public override IShopSellInfo SellInfo { get; } = new InternalSellInfo();
public override List<GenericBuyInfo> BuyInfo { get; } = new InternalBuyInfo();
public class InternalBuyInfo : List<GenericBuyInfo>
{

8
Scripts/Mobiles/Vendors/SBInfo/Armors/SBMetalShields.cs
View file

@ -5,15 +5,13 @@ namespace Server.Mobiles
{
public class SBMetalShields : SBInfo
{
private List<GenericBuyInfo> m_BuyInfo = new InternalBuyInfo();
private IShopSellInfo m_SellInfo = new InternalSellInfo();
public SBMetalShields()
{
}
public override IShopSellInfo SellInfo => m_SellInfo;
public override List<GenericBuyInfo> BuyInfo => m_BuyInfo;
public override IShopSellInfo SellInfo { get; } = new InternalSellInfo();
public override List<GenericBuyInfo> BuyInfo { get; } = new InternalBuyInfo();
public class InternalBuyInfo : List<GenericBuyInfo>
{

8
Scripts/Mobiles/Vendors/SBInfo/Armors/SBPlateArmor.cs
View file

@ -5,15 +5,13 @@ namespace Server.Mobiles
{
public class SBPlateArmor: SBInfo
{
private List<GenericBuyInfo> m_BuyInfo = new InternalBuyInfo();
private IShopSellInfo m_SellInfo = new InternalSellInfo();
public SBPlateArmor()
{
}
public override IShopSellInfo SellInfo => m_SellInfo;
public override List<GenericBuyInfo> BuyInfo => m_BuyInfo;
public override IShopSellInfo SellInfo { get; } = new InternalSellInfo();
public override List<GenericBuyInfo> BuyInfo { get; } = new InternalBuyInfo();
public class InternalBuyInfo : List<GenericBuyInfo>
{

8
Scripts/Mobiles/Vendors/SBInfo/Armors/SBRingmailArmor.cs
View file

@ -5,15 +5,13 @@ namespace Server.Mobiles
{
public class SBRingmailArmor: SBInfo
{
private List<GenericBuyInfo> m_BuyInfo = new InternalBuyInfo();
private IShopSellInfo m_SellInfo = new InternalSellInfo();
public SBRingmailArmor()
{
}
public override IShopSellInfo SellInfo => m_SellInfo;
public override List<GenericBuyInfo> BuyInfo => m_BuyInfo;
public override IShopSellInfo SellInfo { get; } = new InternalSellInfo();
public override List<GenericBuyInfo> BuyInfo { get; } = new InternalBuyInfo();
public class InternalBuyInfo : List<GenericBuyInfo>
{

8
Scripts/Mobiles/Vendors/SBInfo/Armors/SBStuddedArmor.cs
View file

@ -5,15 +5,13 @@ namespace Server.Mobiles
{
public class SBStuddedArmor: SBInfo
{
private List<GenericBuyInfo> m_BuyInfo = new InternalBuyInfo();
private IShopSellInfo m_SellInfo = new InternalSellInfo();
public SBStuddedArmor()
{
}
public override IShopSellInfo SellInfo => m_SellInfo;
public override List<GenericBuyInfo> BuyInfo => m_BuyInfo;
public override IShopSellInfo SellInfo { get; } = new InternalSellInfo();
public override List<GenericBuyInfo> BuyInfo { get; } = new InternalBuyInfo();
public class InternalBuyInfo : List<GenericBuyInfo>
{

8
Scripts/Mobiles/Vendors/SBInfo/Armors/SBWoodenShields.cs
View file

@ -5,15 +5,13 @@ namespace Server.Mobiles
{
public class SBWoodenShields: SBInfo
{
private List<GenericBuyInfo> m_BuyInfo = new InternalBuyInfo();
private IShopSellInfo m_SellInfo = new InternalSellInfo();
public SBWoodenShields()
{
}
public override IShopSellInfo SellInfo => m_SellInfo;
public override List<GenericBuyInfo> BuyInfo => m_BuyInfo;
public override IShopSellInfo SellInfo { get; } = new InternalSellInfo();
public override List<GenericBuyInfo> BuyInfo { get; } = new InternalBuyInfo();
public class InternalBuyInfo : List<GenericBuyInfo>
{

8
Scripts/Mobiles/Vendors/SBInfo/SBAlchemist.cs
View file

@ -5,15 +5,13 @@ namespace Server.Mobiles
{
public class SBAlchemist : SBInfo
{
private List<GenericBuyInfo> m_BuyInfo = new InternalBuyInfo();
private IShopSellInfo m_SellInfo = new InternalSellInfo();
public SBAlchemist()
{
}
public override IShopSellInfo SellInfo => m_SellInfo;
public override List<GenericBuyInfo> BuyInfo => m_BuyInfo;
public override IShopSellInfo SellInfo { get; } = new InternalSellInfo();
public override List<GenericBuyInfo> BuyInfo { get; } = new InternalBuyInfo();
public class InternalBuyInfo : List<GenericBuyInfo>
{

8
Scripts/Mobiles/Vendors/SBInfo/SBAnimalTrainer.cs
View file

@ -4,15 +4,13 @@ namespace Server.Mobiles
{
public class SBAnimalTrainer : SBInfo
{
private List<GenericBuyInfo> m_BuyInfo = new InternalBuyInfo();
private IShopSellInfo m_SellInfo = new InternalSellInfo();
public SBAnimalTrainer()
{
}
public override IShopSellInfo SellInfo => m_SellInfo;
public override List<GenericBuyInfo> BuyInfo => m_BuyInfo;
public override IShopSellInfo SellInfo { get; } = new InternalSellInfo();
public override List<GenericBuyInfo> BuyInfo { get; } = new InternalBuyInfo();
public class InternalBuyInfo : List<GenericBuyInfo>
{

8
Scripts/Mobiles/Vendors/SBInfo/SBArchitect.cs
View file

@ -5,15 +5,13 @@ namespace Server.Mobiles
{
public class SBArchitect : SBInfo
{
private List<GenericBuyInfo> m_BuyInfo = new InternalBuyInfo();
private IShopSellInfo m_SellInfo = new InternalSellInfo();
public SBArchitect()
{
}
public override IShopSellInfo SellInfo => m_SellInfo;
public override List<GenericBuyInfo> BuyInfo => m_BuyInfo;
public override IShopSellInfo SellInfo { get; } = new InternalSellInfo();
public override List<GenericBuyInfo> BuyInfo { get; } = new InternalBuyInfo();
public class InternalBuyInfo : List<GenericBuyInfo>
{

8
Scripts/Mobiles/Vendors/SBInfo/SBBaker.cs
View file

@ -5,15 +5,13 @@ namespace Server.Mobiles
{
public class SBBaker : SBInfo
{
private List<GenericBuyInfo> m_BuyInfo = new InternalBuyInfo();
private IShopSellInfo m_SellInfo = new InternalSellInfo();
public SBBaker()
{
}
public override IShopSellInfo SellInfo => m_SellInfo;
public override List<GenericBuyInfo> BuyInfo => m_BuyInfo;
public override IShopSellInfo SellInfo { get; } = new InternalSellInfo();
public override List<GenericBuyInfo> BuyInfo { get; } = new InternalBuyInfo();
public class InternalBuyInfo : List<GenericBuyInfo>
{

8
Scripts/Mobiles/Vendors/SBInfo/SBBanker.cs
View file

@ -5,15 +5,13 @@ namespace Server.Mobiles
{
public class SBBanker : SBInfo
{
private List<GenericBuyInfo> m_BuyInfo = new InternalBuyInfo();
private IShopSellInfo m_SellInfo = new InternalSellInfo();
public SBBanker()
{
}
public override IShopSellInfo SellInfo => m_SellInfo;
public override List<GenericBuyInfo> BuyInfo => m_BuyInfo;
public override IShopSellInfo SellInfo { get; } = new InternalSellInfo();
public override List<GenericBuyInfo> BuyInfo { get; } = new InternalBuyInfo();
public class InternalBuyInfo : List<GenericBuyInfo>
{

8
Scripts/Mobiles/Vendors/SBInfo/SBBard.cs
View file

@ -5,15 +5,13 @@ namespace Server.Mobiles
{
public class SBBard: SBInfo
{
private List<GenericBuyInfo> m_BuyInfo = new InternalBuyInfo();
private IShopSellInfo m_SellInfo = new InternalSellInfo();
public SBBard()
{
}
public override IShopSellInfo SellInfo => m_SellInfo;
public override List<GenericBuyInfo> BuyInfo => m_BuyInfo;
public override IShopSellInfo SellInfo { get; } = new InternalSellInfo();
public override List<GenericBuyInfo> BuyInfo { get; } = new InternalBuyInfo();
public class InternalBuyInfo : List<GenericBuyInfo>
{

8
Scripts/Mobiles/Vendors/SBInfo/SBBarkeeper.cs
View file

@ -5,15 +5,13 @@ namespace Server.Mobiles
{
public class SBBarkeeper : SBInfo
{
private List<GenericBuyInfo> m_BuyInfo = new InternalBuyInfo();
private IShopSellInfo m_SellInfo = new InternalSellInfo();
public SBBarkeeper()
{
}
public override IShopSellInfo SellInfo => m_SellInfo;
public override List<GenericBuyInfo> BuyInfo => m_BuyInfo;
public override IShopSellInfo SellInfo { get; } = new InternalSellInfo();
public override List<GenericBuyInfo> BuyInfo { get; } = new InternalBuyInfo();
public class InternalBuyInfo : List<GenericBuyInfo>
{

8
Scripts/Mobiles/Vendors/SBInfo/SBBeekeeper.cs
View file

@ -5,15 +5,13 @@ namespace Server.Mobiles
{
public class SBBeekeeper : SBInfo
{
private List<GenericBuyInfo> m_BuyInfo = new InternalBuyInfo();
private IShopSellInfo m_SellInfo = new InternalSellInfo();
public SBBeekeeper()
{
}
public override IShopSellInfo SellInfo => m_SellInfo;
public override List<GenericBuyInfo> BuyInfo => m_BuyInfo;
public override IShopSellInfo SellInfo { get; } = new InternalSellInfo();
public override List<GenericBuyInfo> BuyInfo { get; } = new InternalBuyInfo();
public class InternalBuyInfo : List<GenericBuyInfo>
{

8
Scripts/Mobiles/Vendors/SBInfo/SBBlacksmith.cs
View file

@ -5,15 +5,13 @@ namespace Server.Mobiles
{
public class SBBlacksmith : SBInfo
{
private List<GenericBuyInfo> m_BuyInfo = new InternalBuyInfo();
private IShopSellInfo m_SellInfo = new InternalSellInfo();
public SBBlacksmith()
{
}
public override IShopSellInfo SellInfo => m_SellInfo;
public override List<GenericBuyInfo> BuyInfo => m_BuyInfo;
public override IShopSellInfo SellInfo { get; } = new InternalSellInfo();
public override List<GenericBuyInfo> BuyInfo { get; } = new InternalBuyInfo();
public class InternalBuyInfo : List<GenericBuyInfo>
{

8
Scripts/Mobiles/Vendors/SBInfo/SBBowyer.cs
View file

@ -5,15 +5,13 @@ namespace Server.Mobiles
{
public class SBBowyer : SBInfo
{
private List<GenericBuyInfo> m_BuyInfo = new InternalBuyInfo();
private IShopSellInfo m_SellInfo = new InternalSellInfo();
public SBBowyer()
{
}
public override IShopSellInfo SellInfo => m_SellInfo;
public override List<GenericBuyInfo> BuyInfo => m_BuyInfo;
public override IShopSellInfo SellInfo { get; } = new InternalSellInfo();
public override List<GenericBuyInfo> BuyInfo { get; } = new InternalBuyInfo();
public class InternalBuyInfo : List<GenericBuyInfo>
{

8
Scripts/Mobiles/Vendors/SBInfo/SBButcher.cs
View file

@ -5,15 +5,13 @@ namespace Server.Mobiles
{
public class SBButcher : SBInfo
{
private List<GenericBuyInfo> m_BuyInfo = new InternalBuyInfo();
private IShopSellInfo m_SellInfo = new InternalSellInfo();
public SBButcher()
{
}
public override IShopSellInfo SellInfo => m_SellInfo;
public override List<GenericBuyInfo> BuyInfo => m_BuyInfo;
public override IShopSellInfo SellInfo { get; } = new InternalSellInfo();
public override List<GenericBuyInfo> BuyInfo { get; } = new InternalBuyInfo();
public class InternalBuyInfo : List<GenericBuyInfo>
{

8
Scripts/Mobiles/Vendors/SBInfo/SBCarpenter.cs
View file

@ -5,15 +5,13 @@ namespace Server.Mobiles
{
public class SBCarpenter: SBInfo
{
private List<GenericBuyInfo> m_BuyInfo = new InternalBuyInfo();
private IShopSellInfo m_SellInfo = new InternalSellInfo();
public SBCarpenter()
{
}
public override IShopSellInfo SellInfo => m_SellInfo;
public override List<GenericBuyInfo> BuyInfo => m_BuyInfo;
public override IShopSellInfo SellInfo { get; } = new InternalSellInfo();
public override List<GenericBuyInfo> BuyInfo { get; } = new InternalBuyInfo();
public class InternalBuyInfo : List<GenericBuyInfo>
{

8
Scripts/Mobiles/Vendors/SBInfo/SBCobbler.cs
View file

@ -5,15 +5,13 @@ namespace Server.Mobiles
{
public class SBCobbler : SBInfo
{
private List<GenericBuyInfo> m_BuyInfo = new InternalBuyInfo();
private IShopSellInfo m_SellInfo = new InternalSellInfo();
public SBCobbler()
{
}
public override IShopSellInfo SellInfo => m_SellInfo;
public override List<GenericBuyInfo> BuyInfo => m_BuyInfo;
public override IShopSellInfo SellInfo { get; } = new InternalSellInfo();
public override List<GenericBuyInfo> BuyInfo { get; } = new InternalBuyInfo();
public class InternalBuyInfo : List<GenericBuyInfo>
{

8
Scripts/Mobiles/Vendors/SBInfo/SBCook.cs
View file

@ -5,15 +5,13 @@ namespace Server.Mobiles
{
public class SBCook : SBInfo
{
private List<GenericBuyInfo> m_BuyInfo = new InternalBuyInfo();
private IShopSellInfo m_SellInfo = new InternalSellInfo();
public SBCook()
{
}
public override IShopSellInfo SellInfo => m_SellInfo;
public override List<GenericBuyInfo> BuyInfo => m_BuyInfo;
public override IShopSellInfo SellInfo { get; } = new InternalSellInfo();
public override List<GenericBuyInfo> BuyInfo { get; } = new InternalBuyInfo();
public class InternalBuyInfo : List<GenericBuyInfo>
{

8
Scripts/Mobiles/Vendors/SBInfo/SBFarmer.cs
View file

@ -5,15 +5,13 @@ namespace Server.Mobiles
{
public class SBFarmer : SBInfo
{
private List<GenericBuyInfo> m_BuyInfo = new InternalBuyInfo();
private IShopSellInfo m_SellInfo = new InternalSellInfo();
public SBFarmer()
{
}
public override IShopSellInfo SellInfo => m_SellInfo;
public override List<GenericBuyInfo> BuyInfo => m_BuyInfo;
public override IShopSellInfo SellInfo { get; } = new InternalSellInfo();
public override List<GenericBuyInfo> BuyInfo { get; } = new InternalBuyInfo();
public class InternalBuyInfo : List<GenericBuyInfo>
{

8
Scripts/Mobiles/Vendors/SBInfo/SBFisherman.cs
View file

@ -5,15 +5,13 @@ namespace Server.Mobiles
{
public class SBFisherman : SBInfo
{
private List<GenericBuyInfo> m_BuyInfo = new InternalBuyInfo();
private IShopSellInfo m_SellInfo = new InternalSellInfo();
public SBFisherman()
{
}
public override IShopSellInfo SellInfo => m_SellInfo;
public override List<GenericBuyInfo> BuyInfo => m_BuyInfo;
public override IShopSellInfo SellInfo { get; } = new InternalSellInfo();
public override List<GenericBuyInfo> BuyInfo { get; } = new InternalBuyInfo();
public class InternalBuyInfo : List<GenericBuyInfo>
{

8
Scripts/Mobiles/Vendors/SBInfo/SBFortuneTeller.cs
View file

@ -5,15 +5,13 @@ namespace Server.Mobiles
{
public class SBFortuneTeller : SBInfo
{
private List<GenericBuyInfo> m_BuyInfo = new InternalBuyInfo();
private IShopSellInfo m_SellInfo = new InternalSellInfo();
public SBFortuneTeller()
{
}
public override IShopSellInfo SellInfo => m_SellInfo;
public override List<GenericBuyInfo> BuyInfo => m_BuyInfo;
public override IShopSellInfo SellInfo { get; } = new InternalSellInfo();
public override List<GenericBuyInfo> BuyInfo { get; } = new InternalBuyInfo();
public class InternalBuyInfo : List<GenericBuyInfo>
{

8
Scripts/Mobiles/Vendors/SBInfo/SBFurtrader.cs
View file

@ -5,15 +5,13 @@ namespace Server.Mobiles
{
public class SBFurtrader : SBInfo
{
private List<GenericBuyInfo> m_BuyInfo = new InternalBuyInfo();
private IShopSellInfo m_SellInfo = new InternalSellInfo();
public SBFurtrader()
{
}
public override IShopSellInfo SellInfo => m_SellInfo;
public override List<GenericBuyInfo> BuyInfo => m_BuyInfo;
public override IShopSellInfo SellInfo { get; } = new InternalSellInfo();
public override List<GenericBuyInfo> BuyInfo { get; } = new InternalBuyInfo();
public class InternalBuyInfo : List<GenericBuyInfo>
{

8
Scripts/Mobiles/Vendors/SBInfo/SBGlassblower.cs
View file

@ -5,15 +5,13 @@ namespace Server.Mobiles
{
public class SBGlassblower : SBInfo
{
private List<GenericBuyInfo> m_BuyInfo = new InternalBuyInfo();
private IShopSellInfo m_SellInfo = new InternalSellInfo();
public SBGlassblower()
{
}
public override IShopSellInfo SellInfo => m_SellInfo;
public override List<GenericBuyInfo> BuyInfo => m_BuyInfo;
public override IShopSellInfo SellInfo { get; } = new InternalSellInfo();
public override List<GenericBuyInfo> BuyInfo { get; } = new InternalBuyInfo();
public class InternalBuyInfo : List<GenericBuyInfo>
{

8
Scripts/Mobiles/Vendors/SBInfo/SBHairStylist.cs
View file

@ -5,15 +5,13 @@ namespace Server.Mobiles
{
public class SBHairStylist : SBInfo
{
private List<GenericBuyInfo> m_BuyInfo = new InternalBuyInfo();
private IShopSellInfo m_SellInfo = new InternalSellInfo();
public SBHairStylist()
{
}
public override IShopSellInfo SellInfo => m_SellInfo;
public override List<GenericBuyInfo> BuyInfo => m_BuyInfo;
public override IShopSellInfo SellInfo { get; } = new InternalSellInfo();
public override List<GenericBuyInfo> BuyInfo { get; } = new InternalBuyInfo();
public class InternalBuyInfo : List<GenericBuyInfo>
{

8
Scripts/Mobiles/Vendors/SBInfo/SBHealer.cs
View file

@ -5,15 +5,13 @@ namespace Server.Mobiles
{
public class SBHealer : SBInfo
{
private List<GenericBuyInfo> m_BuyInfo = new InternalBuyInfo();
private IShopSellInfo m_SellInfo = new InternalSellInfo();
public SBHealer()
{
}
public override IShopSellInfo SellInfo => m_SellInfo;
public override List<GenericBuyInfo> BuyInfo => m_BuyInfo;
public override IShopSellInfo SellInfo { get; } = new InternalSellInfo();
public override List<GenericBuyInfo> BuyInfo { get; } = new InternalBuyInfo();
public class InternalBuyInfo : List<GenericBuyInfo>
{

8
Scripts/Mobiles/Vendors/SBInfo/SBHerbalist.cs
View file

@ -5,15 +5,13 @@ namespace Server.Mobiles
{
public class SBHerbalist : SBInfo
{
private List<GenericBuyInfo> m_BuyInfo = new InternalBuyInfo();
private IShopSellInfo m_SellInfo = new InternalSellInfo();
public SBHerbalist()
{
}
public override IShopSellInfo SellInfo => m_SellInfo;
public override List<GenericBuyInfo> BuyInfo => m_BuyInfo;
public override IShopSellInfo SellInfo { get; } = new InternalSellInfo();
public override List<GenericBuyInfo> BuyInfo { get; } = new InternalBuyInfo();
public class InternalBuyInfo : List<GenericBuyInfo>
{

8
Scripts/Mobiles/Vendors/SBInfo/SBHolyMage.cs
View file

@ -6,15 +6,13 @@ namespace Server.Mobiles
{
public class SBHolyMage : SBInfo
{
private List<GenericBuyInfo> m_BuyInfo = new InternalBuyInfo();
private IShopSellInfo m_SellInfo = new InternalSellInfo();
public SBHolyMage()
{
}
public override IShopSellInfo SellInfo => m_SellInfo;
public override List<GenericBuyInfo> BuyInfo => m_BuyInfo;
public override IShopSellInfo SellInfo { get; } = new InternalSellInfo();
public override List<GenericBuyInfo> BuyInfo { get; } = new InternalBuyInfo();
public class InternalBuyInfo : List<GenericBuyInfo>
{

8
Scripts/Mobiles/Vendors/SBInfo/SBHouseDeed.cs
View file

@ -5,15 +5,13 @@ namespace Server.Mobiles
{
public class SBHouseDeed: SBInfo
{
private List<GenericBuyInfo> m_BuyInfo = new InternalBuyInfo();
private IShopSellInfo m_SellInfo = new InternalSellInfo();
public SBHouseDeed()
{
}
public override IShopSellInfo SellInfo => m_SellInfo;
public override List<GenericBuyInfo> BuyInfo => m_BuyInfo;
public override IShopSellInfo SellInfo { get; } = new InternalSellInfo();
public override List<GenericBuyInfo> BuyInfo { get; } = new InternalBuyInfo();
public class InternalBuyInfo : List<GenericBuyInfo>
{

8
Scripts/Mobiles/Vendors/SBInfo/SBInnKeeper.cs
View file

@ -5,15 +5,13 @@ namespace Server.Mobiles
{
public class SBInnKeeper : SBInfo
{
private List<GenericBuyInfo> m_BuyInfo = new InternalBuyInfo();
private IShopSellInfo m_SellInfo = new InternalSellInfo();
public SBInnKeeper()
{
}
public override IShopSellInfo SellInfo => m_SellInfo;
public override List<GenericBuyInfo> BuyInfo => m_BuyInfo;
public override IShopSellInfo SellInfo { get; } = new InternalSellInfo();
public override List<GenericBuyInfo> BuyInfo { get; } = new InternalBuyInfo();
public class InternalBuyInfo : List<GenericBuyInfo>
{

8
Scripts/Mobiles/Vendors/SBInfo/SBJewel.cs
View file

@ -5,15 +5,13 @@ namespace Server.Mobiles
{
public class SBJewel: SBInfo
{
private List<GenericBuyInfo> m_BuyInfo = new InternalBuyInfo();
private IShopSellInfo m_SellInfo = new InternalSellInfo();
public SBJewel()
{
}
public override IShopSellInfo SellInfo => m_SellInfo;
public override List<GenericBuyInfo> BuyInfo => m_BuyInfo;
public override IShopSellInfo SellInfo { get; } = new InternalSellInfo();
public override List<GenericBuyInfo> BuyInfo { get; } = new InternalBuyInfo();
public class InternalBuyInfo : List<GenericBuyInfo>
{

8
Scripts/Mobiles/Vendors/SBInfo/SBKeeperOfChivalry.cs
View file

@ -5,15 +5,13 @@ namespace Server.Mobiles
{
public class SBKeeperOfChivalry : SBInfo
{
private List<GenericBuyInfo> m_BuyInfo = new InternalBuyInfo();
private IShopSellInfo m_SellInfo = new InternalSellInfo();
public SBKeeperOfChivalry()
{
}
public override IShopSellInfo SellInfo => m_SellInfo;
public override List<GenericBuyInfo> BuyInfo => m_BuyInfo;
public override IShopSellInfo SellInfo { get; } = new InternalSellInfo();
public override List<GenericBuyInfo> BuyInfo { get; } = new InternalBuyInfo();
public class InternalBuyInfo : List<GenericBuyInfo>
{

8
Scripts/Mobiles/Vendors/SBInfo/SBLeatherWorker.cs
View file

@ -5,15 +5,13 @@ namespace Server.Mobiles
{
public class SBLeatherWorker: SBInfo
{
private List<GenericBuyInfo> m_BuyInfo = new InternalBuyInfo();
private IShopSellInfo m_SellInfo = new InternalSellInfo();
public SBLeatherWorker()
{
}
public override IShopSellInfo SellInfo => m_SellInfo;
public override List<GenericBuyInfo> BuyInfo => m_BuyInfo;
public override IShopSellInfo SellInfo { get; } = new InternalSellInfo();
public override List<GenericBuyInfo> BuyInfo { get; } = new InternalBuyInfo();
public class InternalBuyInfo : List<GenericBuyInfo>
{

8
Scripts/Mobiles/Vendors/SBInfo/SBMage.cs
View file

@ -6,15 +6,13 @@ namespace Server.Mobiles
{
public class SBMage : SBInfo
{
private List<GenericBuyInfo> m_BuyInfo = new InternalBuyInfo();
private IShopSellInfo m_SellInfo = new InternalSellInfo();
public SBMage()
{
}
public override IShopSellInfo SellInfo => m_SellInfo;
public override List<GenericBuyInfo> BuyInfo => m_BuyInfo;
public override IShopSellInfo SellInfo { get; } = new InternalSellInfo();
public override List<GenericBuyInfo> BuyInfo { get; } = new InternalBuyInfo();
public class InternalBuyInfo : List<GenericBuyInfo>
{

8
Scripts/Mobiles/Vendors/SBInfo/SBMapmaker.cs
View file

@ -5,15 +5,13 @@ namespace Server.Mobiles
{
public class SBMapmaker : SBInfo
{
private List<GenericBuyInfo> m_BuyInfo = new InternalBuyInfo();
private IShopSellInfo m_SellInfo = new InternalSellInfo();
public SBMapmaker()
{
}
public override IShopSellInfo SellInfo => m_SellInfo;
public override List<GenericBuyInfo> BuyInfo => m_BuyInfo;
public override IShopSellInfo SellInfo { get; } = new InternalSellInfo();
public override List<GenericBuyInfo> BuyInfo { get; } = new InternalBuyInfo();
public class InternalBuyInfo : List<GenericBuyInfo>
{

8
Scripts/Mobiles/Vendors/SBInfo/SBMiller.cs
View file

@ -5,15 +5,13 @@ namespace Server.Mobiles
{
public class SBMiller : SBInfo
{
private List<GenericBuyInfo> m_BuyInfo = new InternalBuyInfo();
private IShopSellInfo m_SellInfo = new InternalSellInfo();
public SBMiller()
{
}
public override IShopSellInfo SellInfo => m_SellInfo;
public override List<GenericBuyInfo> BuyInfo => m_BuyInfo;
public override IShopSellInfo SellInfo { get; } = new InternalSellInfo();
public override List<GenericBuyInfo> BuyInfo { get; } = new InternalBuyInfo();
public class InternalBuyInfo : List<GenericBuyInfo>
{

8
Scripts/Mobiles/Vendors/SBInfo/SBMiner.cs
View file

@ -5,15 +5,13 @@ namespace Server.Mobiles
{
public class SBMiner: SBInfo
{
private List<GenericBuyInfo> m_BuyInfo = new InternalBuyInfo();
private IShopSellInfo m_SellInfo = new InternalSellInfo();
public SBMiner()
{
}
public override IShopSellInfo SellInfo => m_SellInfo;
public override List<GenericBuyInfo> BuyInfo => m_BuyInfo;
public override IShopSellInfo SellInfo { get; } = new InternalSellInfo();
public override List<GenericBuyInfo> BuyInfo { get; } = new InternalBuyInfo();
public class InternalBuyInfo : List<GenericBuyInfo>
{

8
Scripts/Mobiles/Vendors/SBInfo/SBMonk.cs
View file

@ -5,15 +5,13 @@ namespace Server.Mobiles
{
public class SBMonk : SBInfo
{
private List<GenericBuyInfo> m_BuyInfo = new InternalBuyInfo();
private IShopSellInfo m_SellInfo = new InternalSellInfo();
public SBMonk()
{
}
public override IShopSellInfo SellInfo => m_SellInfo;
public override List<GenericBuyInfo> BuyInfo => m_BuyInfo;
public override IShopSellInfo SellInfo { get; } = new InternalSellInfo();
public override List<GenericBuyInfo> BuyInfo { get; } = new InternalBuyInfo();
public class InternalBuyInfo : List<GenericBuyInfo>
{

8
Scripts/Mobiles/Vendors/SBInfo/SBNinja.cs
View file

@ -5,15 +5,13 @@ namespace Server.Mobiles
{
public class SBNinja : SBInfo
{
private List<GenericBuyInfo> m_BuyInfo = new InternalBuyInfo();
private IShopSellInfo m_SellInfo = new InternalSellInfo();
public SBNinja()
{
}
public override IShopSellInfo SellInfo => m_SellInfo;
public override List<GenericBuyInfo> BuyInfo => m_BuyInfo;
public override IShopSellInfo SellInfo { get; } = new InternalSellInfo();
public override List<GenericBuyInfo> BuyInfo { get; } = new InternalBuyInfo();
public class InternalBuyInfo : List<GenericBuyInfo>
{

8
Scripts/Mobiles/Vendors/SBInfo/SBPlayerBarkeeper.cs
View file

@ -5,15 +5,13 @@ namespace Server.Mobiles
{
public class SBPlayerBarkeeper : SBInfo
{
private List<GenericBuyInfo> m_BuyInfo = new InternalBuyInfo();
private IShopSellInfo m_SellInfo = new InternalSellInfo();
public SBPlayerBarkeeper()
{
}
public override IShopSellInfo SellInfo => m_SellInfo;
public override List<GenericBuyInfo> BuyInfo => m_BuyInfo;
public override IShopSellInfo SellInfo { get; } = new InternalSellInfo();
public override List<GenericBuyInfo> BuyInfo { get; } = new InternalBuyInfo();
public class InternalBuyInfo : List<GenericBuyInfo>
{

8
Scripts/Mobiles/Vendors/SBInfo/SBProvisioner.cs
View file

@ -6,15 +6,13 @@ namespace Server.Mobiles
{
public class SBProvisioner : SBInfo
{
private List<GenericBuyInfo> m_BuyInfo = new InternalBuyInfo();
private IShopSellInfo m_SellInfo = new InternalSellInfo();
public SBProvisioner()
{
}
public override IShopSellInfo SellInfo => m_SellInfo;
public override List<GenericBuyInfo> BuyInfo => m_BuyInfo;
public override IShopSellInfo SellInfo { get; } = new InternalSellInfo();
public override List<GenericBuyInfo> BuyInfo { get; } = new InternalBuyInfo();
public class InternalBuyInfo : List<GenericBuyInfo>
{

8
Scripts/Mobiles/Vendors/SBInfo/SBRancher.cs
View file

@ -4,15 +4,13 @@ namespace Server.Mobiles
{
public class SBRancher : SBInfo
{
private List<GenericBuyInfo> m_BuyInfo = new InternalBuyInfo();
private IShopSellInfo m_SellInfo = new InternalSellInfo();
public SBRancher()
{
}
public override IShopSellInfo SellInfo => m_SellInfo;
public override List<GenericBuyInfo> BuyInfo => m_BuyInfo;
public override IShopSellInfo SellInfo { get; } = new InternalSellInfo();
public override List<GenericBuyInfo> BuyInfo { get; } = new InternalBuyInfo();
public class InternalBuyInfo : List<GenericBuyInfo>
{

8
Scripts/Mobiles/Vendors/SBInfo/SBRanger.cs
View file

@ -5,15 +5,13 @@ namespace Server.Mobiles
{
public class SBRanger : SBInfo
{
private List<GenericBuyInfo> m_BuyInfo = new InternalBuyInfo();
private IShopSellInfo m_SellInfo = new InternalSellInfo();
public SBRanger()
{
}
public override IShopSellInfo SellInfo => m_SellInfo;
public override List<GenericBuyInfo> BuyInfo => m_BuyInfo;
public override IShopSellInfo SellInfo { get; } = new InternalSellInfo();
public override List<GenericBuyInfo> BuyInfo { get; } = new InternalBuyInfo();
public class InternalBuyInfo : List<GenericBuyInfo>
{

8
Scripts/Mobiles/Vendors/SBInfo/SBRealEstateBroker.cs
View file

@ -5,15 +5,13 @@ namespace Server.Mobiles
{
public class SBRealEstateBroker : SBInfo
{
private List<GenericBuyInfo> m_BuyInfo = new InternalBuyInfo();
private IShopSellInfo m_SellInfo = new InternalSellInfo();
public SBRealEstateBroker()
{
}
public override IShopSellInfo SellInfo => m_SellInfo;
public override List<GenericBuyInfo> BuyInfo => m_BuyInfo;
public override IShopSellInfo SellInfo { get; } = new InternalSellInfo();
public override List<GenericBuyInfo> BuyInfo { get; } = new InternalBuyInfo();
public class InternalBuyInfo : List<GenericBuyInfo>
{

8
Scripts/Mobiles/Vendors/SBInfo/SBSECook.cs
View file

@ -5,15 +5,13 @@ namespace Server.Mobiles
{
public class SBSECook: SBInfo
{
private List<GenericBuyInfo> m_BuyInfo = new InternalBuyInfo();
private IShopSellInfo m_SellInfo = new InternalSellInfo();
public SBSECook()
{
}
public override IShopSellInfo SellInfo => m_SellInfo;
public override List<GenericBuyInfo> BuyInfo => m_BuyInfo;
public override IShopSellInfo SellInfo { get; } = new InternalSellInfo();
public override List<GenericBuyInfo> BuyInfo { get; } = new InternalBuyInfo();
public class InternalBuyInfo : List<GenericBuyInfo>
{

8
Scripts/Mobiles/Vendors/SBInfo/SBSEHats.cs
View file

@ -5,15 +5,13 @@ namespace Server.Mobiles
{
public class SBSEHats: SBInfo
{
private List<GenericBuyInfo> m_BuyInfo = new InternalBuyInfo();
private IShopSellInfo m_SellInfo = new InternalSellInfo();
public SBSEHats()
{
}
public override IShopSellInfo SellInfo => m_SellInfo;
public override List<GenericBuyInfo> BuyInfo => m_BuyInfo;
public override IShopSellInfo SellInfo { get; } = new InternalSellInfo();
public override List<GenericBuyInfo> BuyInfo { get; } = new InternalBuyInfo();
public class InternalBuyInfo : List<GenericBuyInfo>
{

8
Scripts/Mobiles/Vendors/SBInfo/SBSamurai.cs
View file

@ -5,15 +5,13 @@ namespace Server.Mobiles
{
public class SBSamurai : SBInfo
{
private List<GenericBuyInfo> m_BuyInfo = new InternalBuyInfo();
private IShopSellInfo m_SellInfo = new InternalSellInfo();
public SBSamurai()
{
}
public override IShopSellInfo SellInfo => m_SellInfo;
public override List<GenericBuyInfo> BuyInfo => m_BuyInfo;
public override IShopSellInfo SellInfo { get; } = new InternalSellInfo();
public override List<GenericBuyInfo> BuyInfo { get; } = new InternalBuyInfo();
public class InternalBuyInfo : List<GenericBuyInfo>
{

8
Scripts/Mobiles/Vendors/SBInfo/SBScribe.cs
View file

@ -5,15 +5,13 @@ namespace Server.Mobiles
{
public class SBScribe: SBInfo
{
private List<GenericBuyInfo> m_BuyInfo = new InternalBuyInfo();
private IShopSellInfo m_SellInfo = new InternalSellInfo();
public SBScribe()
{
}
public override IShopSellInfo SellInfo => m_SellInfo;
public override List<GenericBuyInfo> BuyInfo => m_BuyInfo;
public override IShopSellInfo SellInfo { get; } = new InternalSellInfo();
public override List<GenericBuyInfo> BuyInfo { get; } = new InternalBuyInfo();
public class InternalBuyInfo : List<GenericBuyInfo>
{

8
Scripts/Mobiles/Vendors/SBInfo/SBShipwright.cs
View file

@ -5,15 +5,13 @@ namespace Server.Mobiles
{
public class SBShipwright : SBInfo
{
private List<GenericBuyInfo> m_BuyInfo = new InternalBuyInfo();
private IShopSellInfo m_SellInfo = new InternalSellInfo();
public SBShipwright()
{
}
public override IShopSellInfo SellInfo => m_SellInfo;
public override List<GenericBuyInfo> BuyInfo => m_BuyInfo;
public override IShopSellInfo SellInfo { get; } = new InternalSellInfo();
public override List<GenericBuyInfo> BuyInfo { get; } = new InternalBuyInfo();
public class InternalBuyInfo : List<GenericBuyInfo>
{

8
Scripts/Mobiles/Vendors/SBInfo/SBSmithTools.cs
View file

@ -5,15 +5,13 @@ namespace Server.Mobiles
{
public class SBSmithTools: SBInfo
{
private List<GenericBuyInfo> m_BuyInfo = new InternalBuyInfo();
private IShopSellInfo m_SellInfo = new InternalSellInfo();
public SBSmithTools()
{
}
public override IShopSellInfo SellInfo => m_SellInfo;
public override List<GenericBuyInfo> BuyInfo => m_BuyInfo;
public override IShopSellInfo SellInfo { get; } = new InternalSellInfo();
public override List<GenericBuyInfo> BuyInfo { get; } = new InternalBuyInfo();
public class InternalBuyInfo : List<GenericBuyInfo>
{

8
Scripts/Mobiles/Vendors/SBInfo/SBStoneCrafter.cs
View file

@ -5,15 +5,13 @@ namespace Server.Mobiles
{
public class SBStoneCrafter : SBInfo
{
private List<GenericBuyInfo> m_BuyInfo = new InternalBuyInfo();
private IShopSellInfo m_SellInfo = new InternalSellInfo();
public SBStoneCrafter()
{
}
public override IShopSellInfo SellInfo => m_SellInfo;
public override List<GenericBuyInfo> BuyInfo => m_BuyInfo;
public override IShopSellInfo SellInfo { get; } = new InternalSellInfo();
public override List<GenericBuyInfo> BuyInfo { get; } = new InternalBuyInfo();
public class InternalBuyInfo : List<GenericBuyInfo>
{

8
Scripts/Mobiles/Vendors/SBInfo/SBTailor.cs
View file

@ -5,15 +5,13 @@ namespace Server.Mobiles
{
public class SBTailor: SBInfo
{
private List<GenericBuyInfo> m_BuyInfo = new InternalBuyInfo();
private IShopSellInfo m_SellInfo = new InternalSellInfo();
public SBTailor()
{
}
public override IShopSellInfo SellInfo => m_SellInfo;
public override List<GenericBuyInfo> BuyInfo => m_BuyInfo;
public override IShopSellInfo SellInfo { get; } = new InternalSellInfo();
public override List<GenericBuyInfo> BuyInfo { get; } = new InternalBuyInfo();
public class InternalBuyInfo : List<GenericBuyInfo>
{

8
Scripts/Mobiles/Vendors/SBInfo/SBTanner.cs
View file

@ -5,15 +5,13 @@ namespace Server.Mobiles
{
public class SBTanner : SBInfo
{
private List<GenericBuyInfo> m_BuyInfo = new InternalBuyInfo();
private IShopSellInfo m_SellInfo = new InternalSellInfo();
public SBTanner()
{
}
public override IShopSellInfo SellInfo => m_SellInfo;
public override List<GenericBuyInfo> BuyInfo => m_BuyInfo;
public override IShopSellInfo SellInfo { get; } = new InternalSellInfo();
public override List<GenericBuyInfo> BuyInfo { get; } = new InternalBuyInfo();
public class InternalBuyInfo : List<GenericBuyInfo>
{

8
Scripts/Mobiles/Vendors/SBInfo/SBTavernKeeper.cs
View file

@ -5,15 +5,13 @@ namespace Server.Mobiles
{
public class SBTavernKeeper : SBInfo
{
private List<GenericBuyInfo> m_BuyInfo = new InternalBuyInfo();
private IShopSellInfo m_SellInfo = new InternalSellInfo();
public SBTavernKeeper()
{
}
public override IShopSellInfo SellInfo => m_SellInfo;
public override List<GenericBuyInfo> BuyInfo => m_BuyInfo;
public override IShopSellInfo SellInfo { get; } = new InternalSellInfo();
public override List<GenericBuyInfo> BuyInfo { get; } = new InternalBuyInfo();
public class InternalBuyInfo : List<GenericBuyInfo>
{

8
Scripts/Mobiles/Vendors/SBInfo/SBThief.cs
View file

@ -5,15 +5,13 @@ namespace Server.Mobiles
{
public class SBThief : SBInfo
{
private List<GenericBuyInfo> m_BuyInfo = new InternalBuyInfo();
private IShopSellInfo m_SellInfo = new InternalSellInfo();
public SBThief()
{
}
public override IShopSellInfo SellInfo => m_SellInfo;
public override List<GenericBuyInfo> BuyInfo => m_BuyInfo;
public override IShopSellInfo SellInfo { get; } = new InternalSellInfo();
public override List<GenericBuyInfo> BuyInfo { get; } = new InternalBuyInfo();
public class InternalBuyInfo : List<GenericBuyInfo>
{

8
Scripts/Mobiles/Vendors/SBInfo/SBTinker.cs
View file

@ -5,15 +5,13 @@ namespace Server.Mobiles
{
public class SBTinker: SBInfo
{
private List<GenericBuyInfo> m_BuyInfo = new InternalBuyInfo();
private IShopSellInfo m_SellInfo = new InternalSellInfo();
public SBTinker()
{
}
public override IShopSellInfo SellInfo => m_SellInfo;
public override List<GenericBuyInfo> BuyInfo => m_BuyInfo;
public override IShopSellInfo SellInfo { get; } = new InternalSellInfo();
public override List<GenericBuyInfo> BuyInfo { get; } = new InternalBuyInfo();
public class InternalBuyInfo : List<GenericBuyInfo>
{

8
Scripts/Mobiles/Vendors/SBInfo/SBVagabond.cs
View file

@ -5,15 +5,13 @@ namespace Server.Mobiles
{
public class SBVagabond : SBInfo
{
private List<GenericBuyInfo> m_BuyInfo = new InternalBuyInfo();
private IShopSellInfo m_SellInfo = new InternalSellInfo();
public SBVagabond()
{
}
public override IShopSellInfo SellInfo => m_SellInfo;
public override List<GenericBuyInfo> BuyInfo => m_BuyInfo;
public override IShopSellInfo SellInfo { get; } = new InternalSellInfo();
public override List<GenericBuyInfo> BuyInfo { get; } = new InternalBuyInfo();
public class InternalBuyInfo : List<GenericBuyInfo>
{

8
Scripts/Mobiles/Vendors/SBInfo/SBVarietyDealer.cs
View file

@ -6,15 +6,13 @@ namespace Server.Mobiles
{
public class SBVarietyDealer : SBInfo
{
private List<GenericBuyInfo> m_BuyInfo = new InternalBuyInfo();
private IShopSellInfo m_SellInfo = new InternalSellInfo();
public SBVarietyDealer()
{
}
public override IShopSellInfo SellInfo => m_SellInfo;
public override List<GenericBuyInfo> BuyInfo => m_BuyInfo;
public override IShopSellInfo SellInfo { get; } = new InternalSellInfo();
public override List<GenericBuyInfo> BuyInfo { get; } = new InternalBuyInfo();
public class InternalBuyInfo : List<GenericBuyInfo>
{

8
Scripts/Mobiles/Vendors/SBInfo/SBVeterinarian.cs
View file

@ -5,15 +5,13 @@ namespace Server.Mobiles
{
public class SBVeterinarian : SBInfo
{
private List<GenericBuyInfo> m_BuyInfo = new InternalBuyInfo();
private IShopSellInfo m_SellInfo = new InternalSellInfo();
public SBVeterinarian()
{
}
public override IShopSellInfo SellInfo => m_SellInfo;
public override List<GenericBuyInfo> BuyInfo => m_BuyInfo;
public override IShopSellInfo SellInfo { get; } = new InternalSellInfo();
public override List<GenericBuyInfo> BuyInfo { get; } = new InternalBuyInfo();
public class InternalBuyInfo : List<GenericBuyInfo>
{

8
Scripts/Mobiles/Vendors/SBInfo/SBWaiter.cs
View file

@ -5,15 +5,13 @@ namespace Server.Mobiles
{
public class SBWaiter : SBInfo
{
private List<GenericBuyInfo> m_BuyInfo = new InternalBuyInfo();
private IShopSellInfo m_SellInfo = new InternalSellInfo();
public SBWaiter()
{
}
public override IShopSellInfo SellInfo => m_SellInfo;
public override List<GenericBuyInfo> BuyInfo => m_BuyInfo;
public override IShopSellInfo SellInfo { get; } = new InternalSellInfo();
public override List<GenericBuyInfo> BuyInfo { get; } = new InternalBuyInfo();
public class InternalBuyInfo : List<GenericBuyInfo>
{

8
Scripts/Mobiles/Vendors/SBInfo/SBWeaponSmith.cs
View file

@ -5,15 +5,13 @@ namespace Server.Mobiles
{
public class SBWeaponSmith: SBInfo
{
private List<GenericBuyInfo> m_BuyInfo = new InternalBuyInfo();
private IShopSellInfo m_SellInfo = new InternalSellInfo();
public SBWeaponSmith()
{
}
public override IShopSellInfo SellInfo => m_SellInfo;
public override List<GenericBuyInfo> BuyInfo => m_BuyInfo;
public override IShopSellInfo SellInfo { get; } = new InternalSellInfo();
public override List<GenericBuyInfo> BuyInfo { get; } = new InternalBuyInfo();
public class InternalBuyInfo : List<GenericBuyInfo>
{

8
Scripts/Mobiles/Vendors/SBInfo/SBWeaver.cs
View file

@ -5,15 +5,13 @@ namespace Server.Mobiles
{
public class SBWeaver: SBInfo
{
private List<GenericBuyInfo> m_BuyInfo = new InternalBuyInfo();
private IShopSellInfo m_SellInfo = new InternalSellInfo();
public SBWeaver()
{
}
public override IShopSellInfo SellInfo => m_SellInfo;
public override List<GenericBuyInfo> BuyInfo => m_BuyInfo;
public override IShopSellInfo SellInfo { get; } = new InternalSellInfo();
public override List<GenericBuyInfo> BuyInfo { get; } = new InternalBuyInfo();
public class InternalBuyInfo : List<GenericBuyInfo>
{

8
Scripts/Mobiles/Vendors/SBInfo/SE/SBSEArmor.cs
View file

@ -5,15 +5,13 @@ namespace Server.Mobiles
{
public class SBSEArmor: SBInfo
{
private List<GenericBuyInfo> m_BuyInfo = new InternalBuyInfo();
private IShopSellInfo m_SellInfo = new InternalSellInfo();
public SBSEArmor()
{
}
public override IShopSellInfo SellInfo => m_SellInfo;
public override List<GenericBuyInfo> BuyInfo => m_BuyInfo;
public override IShopSellInfo SellInfo { get; } = new InternalSellInfo();
public override List<GenericBuyInfo> BuyInfo { get; } = new InternalBuyInfo();
public class InternalBuyInfo : List<GenericBuyInfo>
{

8
Scripts/Mobiles/Vendors/SBInfo/SE/SBSEBowyer.cs
View file

@ -5,15 +5,13 @@ namespace Server.Mobiles
{
public class SBSEBowyer: SBInfo
{
private List<GenericBuyInfo> m_BuyInfo = new InternalBuyInfo();
private IShopSellInfo m_SellInfo = new InternalSellInfo();
public SBSEBowyer()
{
}
public override IShopSellInfo SellInfo => m_SellInfo;
public override List<GenericBuyInfo> BuyInfo => m_BuyInfo;
public override IShopSellInfo SellInfo { get; } = new InternalSellInfo();
public override List<GenericBuyInfo> BuyInfo { get; } = new InternalBuyInfo();
public class InternalBuyInfo : List<GenericBuyInfo>
{

8
Scripts/Mobiles/Vendors/SBInfo/SE/SBSECarpenter.cs
View file

@ -5,15 +5,13 @@ namespace Server.Mobiles
{
public class SBSECarpenter: SBInfo
{
private List<GenericBuyInfo> m_BuyInfo = new InternalBuyInfo();
private IShopSellInfo m_SellInfo = new InternalSellInfo();
public SBSECarpenter()
{
}
public override IShopSellInfo SellInfo => m_SellInfo;
public override List<GenericBuyInfo> BuyInfo => m_BuyInfo;
public override IShopSellInfo SellInfo { get; } = new InternalSellInfo();
public override List<GenericBuyInfo> BuyInfo { get; } = new InternalBuyInfo();
public class InternalBuyInfo : List<GenericBuyInfo>
{

8
Scripts/Mobiles/Vendors/SBInfo/SE/SBSEFood.cs
View file

@ -5,15 +5,13 @@ namespace Server.Mobiles
{
public class SBSEFood: SBInfo
{
private List<GenericBuyInfo> m_BuyInfo = new InternalBuyInfo();
private IShopSellInfo m_SellInfo = new InternalSellInfo();
public SBSEFood()
{
}
public override IShopSellInfo SellInfo => m_SellInfo;
public override List<GenericBuyInfo> BuyInfo => m_BuyInfo;
public override IShopSellInfo SellInfo { get; } = new InternalSellInfo();
public override List<GenericBuyInfo> BuyInfo { get; } = new InternalBuyInfo();
public class InternalBuyInfo : List<GenericBuyInfo>
{

8
Scripts/Mobiles/Vendors/SBInfo/SE/SBSELeatherArmor.cs
View file

@ -5,15 +5,13 @@ namespace Server.Mobiles
{
public class SBSELeatherArmor: SBInfo
{
private List<GenericBuyInfo> m_BuyInfo = new InternalBuyInfo();
private IShopSellInfo m_SellInfo = new InternalSellInfo();
public SBSELeatherArmor()
{
}
public override IShopSellInfo SellInfo => m_SellInfo;
public override List<GenericBuyInfo> BuyInfo => m_BuyInfo;
public override IShopSellInfo SellInfo { get; } = new InternalSellInfo();
public override List<GenericBuyInfo> BuyInfo { get; } = new InternalBuyInfo();
public class InternalBuyInfo : List<GenericBuyInfo>
{

8
Scripts/Mobiles/Vendors/SBInfo/SE/SBSEWeapons.cs
View file

@ -5,15 +5,13 @@ namespace Server.Mobiles
{
public class SBSEWeapons: SBInfo
{
private List<GenericBuyInfo> m_BuyInfo = new InternalBuyInfo();
private IShopSellInfo m_SellInfo = new InternalSellInfo();
public SBSEWeapons()
{
}
public override IShopSellInfo SellInfo => m_SellInfo;
public override List<GenericBuyInfo> BuyInfo => m_BuyInfo;
public override IShopSellInfo SellInfo { get; } = new InternalSellInfo();
public override List<GenericBuyInfo> BuyInfo { get; } = new InternalBuyInfo();
public class InternalBuyInfo : List<GenericBuyInfo>
{

8
Scripts/Mobiles/Vendors/SBInfo/Weapons/SBAxeWeapon.cs
View file

@ -5,15 +5,13 @@ namespace Server.Mobiles
{
public class SBAxeWeapon: SBInfo
{
private List<GenericBuyInfo> m_BuyInfo = new InternalBuyInfo();
private IShopSellInfo m_SellInfo = new InternalSellInfo();
public SBAxeWeapon()
{
}
public override IShopSellInfo SellInfo => m_SellInfo;
public override List<GenericBuyInfo> BuyInfo => m_BuyInfo;
public override IShopSellInfo SellInfo { get; } = new InternalSellInfo();
public override List<GenericBuyInfo> BuyInfo { get; } = new InternalBuyInfo();
public class InternalBuyInfo : List<GenericBuyInfo>
{

8
Scripts/Mobiles/Vendors/SBInfo/Weapons/SBKnifeWeapon.cs
View file

@ -5,15 +5,13 @@ namespace Server.Mobiles
{
public class SBKnifeWeapon: SBInfo
{
private List<GenericBuyInfo> m_BuyInfo = new InternalBuyInfo();
private IShopSellInfo m_SellInfo = new InternalSellInfo();
public SBKnifeWeapon()
{
}
public override IShopSellInfo SellInfo => m_SellInfo;
public override List<GenericBuyInfo> BuyInfo => m_BuyInfo;
public override IShopSellInfo SellInfo { get; } = new InternalSellInfo();
public override List<GenericBuyInfo> BuyInfo { get; } = new InternalBuyInfo();
public class InternalBuyInfo : List<GenericBuyInfo>
{

8
Scripts/Mobiles/Vendors/SBInfo/Weapons/SBMaceWeapon.cs
View file

@ -5,15 +5,13 @@ namespace Server.Mobiles
{
public class SBMaceWeapon: SBInfo
{
private List<GenericBuyInfo> m_BuyInfo = new InternalBuyInfo();
private IShopSellInfo m_SellInfo = new InternalSellInfo();
public SBMaceWeapon()
{
}
public override IShopSellInfo SellInfo => m_SellInfo;
public override List<GenericBuyInfo> BuyInfo => m_BuyInfo;
public override IShopSellInfo SellInfo { get; } = new InternalSellInfo();
public override List<GenericBuyInfo> BuyInfo { get; } = new InternalBuyInfo();
public class InternalBuyInfo : List<GenericBuyInfo>
{

8
Scripts/Mobiles/Vendors/SBInfo/Weapons/SBPoleArmWeapon.cs
View file

@ -5,15 +5,13 @@ namespace Server.Mobiles
{
public class SBPoleArmWeapon: SBInfo
{
private List<GenericBuyInfo> m_BuyInfo = new InternalBuyInfo();
private IShopSellInfo m_SellInfo = new InternalSellInfo();
public SBPoleArmWeapon()
{
}
public override IShopSellInfo SellInfo => m_SellInfo;
public override List<GenericBuyInfo> BuyInfo => m_BuyInfo;
public override IShopSellInfo SellInfo { get; } = new InternalSellInfo();
public override List<GenericBuyInfo> BuyInfo { get; } = new InternalBuyInfo();
public class InternalBuyInfo : List<GenericBuyInfo>
{

8
Scripts/Mobiles/Vendors/SBInfo/Weapons/SBRangedWeapon.cs
View file

@ -5,15 +5,13 @@ namespace Server.Mobiles
{
public class SBRangedWeapon: SBInfo
{
private List<GenericBuyInfo> m_BuyInfo = new InternalBuyInfo();
private IShopSellInfo m_SellInfo = new InternalSellInfo();
public SBRangedWeapon()
{
}
public override IShopSellInfo SellInfo => m_SellInfo;
public override List<GenericBuyInfo> BuyInfo => m_BuyInfo;
public override IShopSellInfo SellInfo { get; } = new InternalSellInfo();
public override List<GenericBuyInfo> BuyInfo { get; } = new InternalBuyInfo();
public class InternalBuyInfo : List<GenericBuyInfo>
{

8
Scripts/Mobiles/Vendors/SBInfo/Weapons/SBSpearForkWeapon.cs
View file

@ -5,15 +5,13 @@ namespace Server.Mobiles
{
public class SBSpearForkWeapon: SBInfo
{
private List<GenericBuyInfo> m_BuyInfo = new InternalBuyInfo();
private IShopSellInfo m_SellInfo = new InternalSellInfo();
public SBSpearForkWeapon()
{
}
public override IShopSellInfo SellInfo => m_SellInfo;
public override List<GenericBuyInfo> BuyInfo => m_BuyInfo;
public override IShopSellInfo SellInfo { get; } = new InternalSellInfo();
public override List<GenericBuyInfo> BuyInfo { get; } = new InternalBuyInfo();
public class InternalBuyInfo : List<GenericBuyInfo>
{

8
Scripts/Mobiles/Vendors/SBInfo/Weapons/SBStavesWeapon.cs
View file

@ -5,15 +5,13 @@ namespace Server.Mobiles
{
public class SBStavesWeapon: SBInfo
{
private List<GenericBuyInfo> m_BuyInfo = new InternalBuyInfo();
private IShopSellInfo m_SellInfo = new InternalSellInfo();
public SBStavesWeapon()
{
}
public override IShopSellInfo SellInfo => m_SellInfo;
public override List<GenericBuyInfo> BuyInfo => m_BuyInfo;
public override IShopSellInfo SellInfo { get; } = new InternalSellInfo();
public override List<GenericBuyInfo> BuyInfo { get; } = new InternalBuyInfo();
public class InternalBuyInfo : List<GenericBuyInfo>
{

8
Scripts/Mobiles/Vendors/SBInfo/Weapons/SBSwordWeapon.cs
View file

@ -5,15 +5,13 @@ namespace Server.Mobiles
{
public class SBSwordWeapon: SBInfo
{
private List<GenericBuyInfo> m_BuyInfo = new InternalBuyInfo();
private IShopSellInfo m_SellInfo = new InternalSellInfo();
public SBSwordWeapon()
{
}
public override IShopSellInfo SellInfo => m_SellInfo;
public override List<GenericBuyInfo> BuyInfo => m_BuyInfo;
public override IShopSellInfo SellInfo { get; } = new InternalSellInfo();
public override List<GenericBuyInfo> BuyInfo { get; } = new InternalBuyInfo();
public class InternalBuyInfo : List<GenericBuyInfo>
{

87
Scripts/Mobiles/Vendors/VendorInventory.cs
View file

@ -8,69 +8,40 @@ namespace Server.Mobiles
{
public static readonly TimeSpan GracePeriod = TimeSpan.FromDays( 7.0 );
private BaseHouse m_House;
private string m_VendorName;
private string m_ShopName;
private Mobile m_Owner;
private List<Item> m_Items;
private int m_Gold;
private DateTime m_ExpireTime;
private Timer m_ExpireTimer;
public VendorInventory( BaseHouse house, Mobile owner, string vendorName, string shopName )
{
m_House = house;
m_Owner = owner;
m_VendorName = vendorName;
m_ShopName = shopName;
House = house;
Owner = owner;
VendorName = vendorName;
ShopName = shopName;
m_Items = new List<Item>();
Items = new List<Item>();
m_ExpireTime = DateTime.UtcNow + GracePeriod;
ExpireTime = DateTime.UtcNow + GracePeriod;
m_ExpireTimer = new ExpireTimer( this, GracePeriod );
m_ExpireTimer.Start();
}
public BaseHouse House
{
get => m_House;
set => m_House = value;
}
public BaseHouse House { get; set; }
public string VendorName
{
get => m_VendorName;
set => m_VendorName = value;
}
public string VendorName { get; set; }
public string ShopName
{
get => m_ShopName;
set => m_ShopName = value;
}
public string ShopName { get; set; }
public Mobile Owner
{
get => m_Owner;
set => m_Owner = value;
}
public Mobile Owner { get; set; }
public List<Item> Items => m_Items;
public List<Item> Items { get; }
public int Gold
{
get => m_Gold;
set => m_Gold = value;
}
public int Gold { get; set; }
public DateTime ExpireTime => m_ExpireTime;
public DateTime ExpireTime { get; }
public void AddItem( Item item )
{
item.Internalize();
m_Items.Add( item );
Items.Add( item );
}
public void Delete()
@ -92,38 +63,38 @@ namespace Server.Mobiles
{
writer.WriteEncodedInt( 0 ); // version
writer.Write( (Mobile) m_Owner );
writer.Write( (string) m_VendorName );
writer.Write( (string) m_ShopName );
writer.Write( (Mobile) Owner );
writer.Write( (string) VendorName );
writer.Write( (string) ShopName );
writer.Write( m_Items, true );
writer.Write( (int) m_Gold );
writer.Write( Items, true );
writer.Write( (int) Gold );
writer.WriteDeltaTime( m_ExpireTime );
writer.WriteDeltaTime( ExpireTime );
}
public VendorInventory( BaseHouse house, GenericReader reader )
{
m_House = house;
House = house;
int version = reader.ReadEncodedInt();
m_Owner = reader.ReadMobile();
m_VendorName = reader.ReadString();
m_ShopName = reader.ReadString();
Owner = reader.ReadMobile();
VendorName = reader.ReadString();
ShopName = reader.ReadString();
m_Items = reader.ReadStrongItemList();
m_Gold = reader.ReadInt();
Items = reader.ReadStrongItemList();
Gold = reader.ReadInt();
m_ExpireTime = reader.ReadDeltaTime();
ExpireTime = reader.ReadDeltaTime();
if ( m_Items.Count == 0 && m_Gold == 0 )
if ( Items.Count == 0 && Gold == 0 )
{
Timer.DelayCall( TimeSpan.Zero, Delete );
}
else
{
TimeSpan delay = m_ExpireTime - DateTime.UtcNow;
TimeSpan delay = ExpireTime - DateTime.UtcNow;
m_ExpireTimer = new ExpireTimer( this, delay > TimeSpan.Zero ? delay : TimeSpan.Zero );
m_ExpireTimer.Start();
}