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

Add DefaultName property to Mobiles & Items (#18)

Browse source
This commit is contained in:
Kamron Batman 2018-08-09 17:18:41 -07:00 • committed by GitHub
parent b06f5bf60d
commit 8ee42c8ea2
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
713 changed files with 5112 additions and 4987 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -34,11 +34,11 @@ namespace Server.Mobiles
private DateTime m_NextTrickOrTreat;
public override bool CanTeach { get { return true; } }
public override bool CanTeach => true;
public override bool BardImmune { get { return true; } }
public override bool BardImmune => true;
public override bool PlayerRangeSensitive { get { return true; } }
public override bool PlayerRangeSensitive => true;
public virtual bool IsActiveVendor { get { return true; } }
public virtual bool IsActiveBuyer { get { return IsActiveVendor; } } // response to vendor SELL
@ -46,11 +46,11 @@ namespace Server.Mobiles
public virtual NpcGuild NpcGuild { get { return NpcGuild.None; } }
public override bool IsInvulnerable { get { return true; } }
public override bool IsInvulnerable => true;
public virtual DateTime NextTrickOrTreat { get { return m_NextTrickOrTreat; } set { m_NextTrickOrTreat = value; } }
public override bool ShowFameTitle { get { return false; } }
public override bool ShowFameTitle => false;
public virtual bool IsValidBulkOrder( Item item )
{
@ -1398,7 +1398,7 @@ namespace Server.Mobiles
{
if ( SupportsBulkOrders( from ) )
list.Add( new BulkOrderInfoEntry( from, this ) );
if ( IsActiveSeller )
list.Add( new VendorBuyEntry( from, this ) );

4
Scripts/Mobiles/Vendors/BeverageBuy.cs
View file

@ -8,7 +8,7 @@ namespace Server.Mobiles
{
private BeverageType m_Content;
public override bool CanCacheDisplay{ get{ return false; } }
public override bool CanCacheDisplay => false;
public BeverageBuyInfo( Type type, BeverageType content, int price, int amount, int itemID, int hue ) : this( null, type, content, price, amount, itemID, hue )
{
@ -31,4 +31,4 @@ namespace Server.Mobiles
return (IEntity)Activator.CreateInstance( Type, new object[]{ m_Content } );
}
}
}
}

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

@ -13,10 +13,10 @@ namespace Server.Mobiles
private List<SBInfo> m_SBInfos = new List<SBInfo>();
protected override List<SBInfo> SBInfos{ get { return m_SBInfos; } }
public override bool ClickTitle{ get{ return false; } }
public override bool ClickTitle => false;
public override bool IsActiveBuyer{ get{ return false; } }
public override bool IsActiveSeller{ get{ return true; } }
public override bool IsActiveBuyer => false;
public override bool IsActiveSeller => true;
public override bool OnBuyItems( Mobile buyer, List<BuyItemResponse> list )
{
@ -585,4 +585,4 @@ namespace Server.Mobiles
}
}
}
}
}

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

@ -11,9 +11,9 @@ namespace Server.Mobiles
private List<SBInfo> m_SBInfos = new List<SBInfo>();
protected override List<SBInfo> SBInfos{ get { return m_SBInfos; } }
public override bool IsActiveVendor{ get{ return false; } }
public override bool IsActiveVendor => false;
public override bool ClickTitle{ get{ return false; } }
public override bool ClickTitle => false;
public virtual int JoinCost{ get{ return 500; } }
@ -164,4 +164,4 @@ namespace Server.Mobiles
int version = reader.ReadInt();
}
}
}
}

6
Scripts/Mobiles/Vendors/NPC/Guildmasters/BlacksmithGuildmaster.cs
View file

@ -8,9 +8,9 @@ namespace Server.Mobiles
{
public override NpcGuild NpcGuild{ get{ return NpcGuild.BlacksmithsGuild; } }
public override bool IsActiveVendor{ get{ return true; } }
public override bool IsActiveVendor => true;
public override bool ClickTitle{ get{ return true; } }
public override bool ClickTitle => true;
[Constructible]
public BlacksmithGuildmaster() : base( "blacksmith" )
@ -67,4 +67,4 @@ namespace Server.Mobiles
int version = reader.ReadInt();
}
}
}
}

6
Scripts/Mobiles/Vendors/NPC/GypsyBanker.cs
View file

@ -11,9 +11,9 @@ namespace Server.Mobiles
{
public class GypsyBanker : Banker
{
public override bool IsActiveVendor{ get{ return false; } }
public override bool IsActiveVendor => false;
public override NpcGuild NpcGuild{ get{ return NpcGuild.None; } }
public override bool ClickTitle{ get{ return false; } }
public override bool ClickTitle => false;
[Constructible]
public GypsyBanker()
@ -86,4 +86,4 @@ namespace Server.Mobiles
int version = reader.ReadInt();
}
}
}
}

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

@ -174,11 +174,11 @@ namespace Server.Mobiles
set{ m_TipMessage = value; }
}
public override bool IsActiveBuyer{ get{ return false; } }
public override bool IsActiveSeller{ get{ return ( m_SBInfos.Count > 0 ); } }
public override bool IsActiveBuyer => false;
public override bool IsActiveSeller => ( m_SBInfos.Count > 0 );
public override bool DisallowAllMoves{ get{ return true; } }
public override bool NoHouseRestrictions{ get{ return true; } }
public override bool DisallowAllMoves => true;
public override bool NoHouseRestrictions => true;
public BarkeeperRumor[] Rumors{ get{ return m_Rumors; } }
@ -488,8 +488,8 @@ namespace Server.Mobiles
}
}
private List<SBInfo> m_SBInfos = new List<SBInfo>();
protected override List<SBInfo> SBInfos{ get { return m_SBInfos; } }
private List<SBInfo> m_SBInfos = new List<SBInfo>();
protected override List<SBInfo> SBInfos{ get { return m_SBInfos; } }
public override void InitSBInfo()
{
@ -974,7 +974,7 @@ namespace Server.Mobiles
AddButton( 130, 120, 4005, 4007, GetButtonID( 5, 0 ), GumpButtonType.Reply, 0 );
AddHtml( 170, 120, 120, 20, "Title", false, false );
if ( m_Barkeeper.BodyValue != 0x340 && m_Barkeeper.BodyValue != 0x402 ) {
if ( m_Barkeeper.BodyValue != 0x340 && m_Barkeeper.BodyValue != 0x402 ) {
AddButton( 130, 200, 4005, 4007, GetButtonID( 5, 1 ), GumpButtonType.Reply, 0 );
AddHtml( 170, 200, 120, 20, "Appearance", false, false );
@ -1069,4 +1069,4 @@ namespace Server.Mobiles
}
}
}
}
}

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

@ -178,7 +178,7 @@ namespace Server.Mobiles
m_Item = item;
}
public override bool NonLocalUse{ get{ return true; } }
public override bool NonLocalUse => true;
public override void OnClick()
{
@ -405,7 +405,7 @@ namespace Server.Mobiles
}
}
break;
break;
}
}
@ -554,7 +554,7 @@ namespace Server.Mobiles
public PlayerVendorPlaceholder Placeholder
{
get{ return m_Placeholder; }
get{ return m_Placeholder; }
set{ m_Placeholder = value; }
}
@ -576,7 +576,7 @@ namespace Server.Mobiles
public int ChargePerDay
{
get
{
{
if ( BaseHouse.NewVendorSystem )
{
return ChargePerRealWorldDay / 12;
@ -657,7 +657,7 @@ namespace Server.Mobiles
FixDresswear();
/* Possible cases regarding item return:
*
*
* 1. No item must be returned
* -> do nothing.
* 2. ( toBackpack is false OR the vendor is in the internal map ) AND the vendor is associated with a AOS house
@ -1302,7 +1302,7 @@ namespace Server.Mobiles
e.Handled = true;
}
}
}
else if ( e.HasKeyword( 0x3D ) || (e.HasKeyword( 0x172 ) && WasNamed( e.Speech )) ) // vendor browse, *browse
{
if ( House != null && House.IsBanned( from ) && !IsOwner( from ) )
@ -1316,14 +1316,14 @@ namespace Server.Mobiles
else
{
IPooledEnumerable<PlayerVendor> mobiles = e.Mobile.GetMobilesInRange<PlayerVendor>( 2 );
foreach ( PlayerVendor m in mobiles )
if ( m.CanSee( e.Mobile ) && m.InLOS( e.Mobile ) )
m.OpenBackpack( from );
mobiles.Free();
}
e.Handled = true;
}
}
@ -1346,7 +1346,7 @@ namespace Server.Mobiles
}
else
{
SayTo( from, 503226 ); // What do you care? You don't run this shop.
SayTo( from, 503226 ); // What do you care? You don't run this shop.
}
}
else if ( e.HasKeyword( 0x40 ) || (e.HasKeyword( 0x175 ) && WasNamed( e.Speech )) ) // vendor dismiss, *dismiss

4
Scripts/Mobiles/Vendors/PresetMapBuy.cs
View file

@ -8,7 +8,7 @@ namespace Server.Mobiles
{
private PresetMapEntry m_Entry;
public override bool CanCacheDisplay{ get{ return false; } }
public override bool CanCacheDisplay => false;
public PresetMapBuyInfo( PresetMapEntry entry, int price, int amount ) : base( entry.Name.ToString(), null, price, amount, 0x14EC, 0 )
{
@ -20,4 +20,4 @@ namespace Server.Mobiles
return new PresetMap( m_Entry );
}
}
}
}