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

Removes implicit this.

Browse source
This commit is contained in:
Kamron Batman 2018-09-14 12:56:58 -07:00
parent 04b4cfe75b
commit 83dcf536d8
533 changed files with 2804 additions and 2806 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -479,15 +479,15 @@ namespace Server.Mobiles
if ( !Core.AOS )
NameHue = 0x35;
if ( this.Female = Utility.RandomBool() )
if ( Female = Utility.RandomBool() )
{
this.Body = 0x191;
this.Name = NameList.RandomName( "female" );
Body = 0x191;
Name = NameList.RandomName( "female" );
}
else
{
this.Body = 0x190;
this.Name = NameList.RandomName( "male" );
Body = 0x190;
Name = NameList.RandomName( "male" );
}
}
@ -634,12 +634,12 @@ namespace Server.Mobiles
{
List<Item> list = new List<Item>();
foreach ( Item item in this.Items )
if ( item.Movable && item != this.Backpack && item.Layer != Layer.Hair && item.Layer != Layer.FacialHair )
foreach ( Item item in Items )
if ( item.Movable && item != Backpack && item.Layer != Layer.Hair && item.Layer != Layer.FacialHair )
list.Add( item );
if ( this.Backpack != null )
list.AddRange( this.Backpack.Items );
if ( Backpack != null )
list.AddRange( Backpack.Items );
return list;
}
@ -668,7 +668,7 @@ namespace Server.Mobiles
if ( list.Count > 0 || HoldGold > 0 ) // No case 1
{
if ( ( !toBackpack || this.Map == Map.Internal ) && House != null && House.IsAosRules ) // Case 2
if ( ( !toBackpack || Map == Map.Internal ) && House != null && House.IsAosRules ) // Case 2
{
if ( House.IsOwner( Owner ) ) // Move to moving crate
{
@ -696,7 +696,7 @@ namespace Server.Mobiles
House.VendorInventories.Add( inventory );
}
}
else if ( ( toBackpack || House == null || !House.IsAosRules ) && this.Map != Map.Internal ) // Case 3 - Move to backpack
else if ( ( toBackpack || House == null || !House.IsAosRules ) && Map != Map.Internal ) // Case 3 - Move to backpack
{
Container backpack = new Backpack();
@ -708,7 +708,7 @@ namespace Server.Mobiles
backpack.DropItem( item );
}
backpack.MoveToWorld( this.Location, this.Map );
backpack.MoveToWorld( Location, Map );
}
}
@ -817,7 +817,7 @@ namespace Server.Mobiles
{
Item parent = item.Parent as Item;
if ( parent == this.Backpack )
if ( parent == Backpack )
return true;
if ( parent is Container )
@ -862,7 +862,7 @@ namespace Server.Mobiles
{
base.OnItemRemoved( item );
if ( item == this.Backpack )
if ( item == Backpack )
{
foreach ( Item subItem in item.Items )
{
@ -883,11 +883,11 @@ namespace Server.Mobiles
{
if ( BaseHouse.NewVendorSystem )
{
if ( this.HoldGold < 1000000 )
if ( HoldGold < 1000000 )
{
SayTo( from, 503210 ); // I'll take that to fund my services.
this.HoldGold += item.Amount;
HoldGold += item.Amount;
item.Delete();
return true;
@ -901,11 +901,11 @@ namespace Server.Mobiles
}
else
{
if ( this.BankAccount < 1000000 )
if ( BankAccount < 1000000 )
{
SayTo( from, 503210 ); // I'll take that to fund my services.
this.BankAccount += item.Amount;
BankAccount += item.Amount;
item.Delete();
return true;
@ -922,7 +922,7 @@ namespace Server.Mobiles
{
bool newItem = ( GetVendorItem( item ) == null );
if ( this.Backpack != null && this.Backpack.TryDropItem( from, item, false ) )
if ( Backpack != null && Backpack.TryDropItem( from, item, false ) )
{
if ( newItem )
OnItemGiven( from, item );
@ -993,7 +993,7 @@ namespace Server.Mobiles
public override bool CheckNonlocalLift( Mobile from, Item item )
{
if ( item.IsChildOf( this.Backpack ) )
if ( item.IsChildOf( Backpack ) )
{
if ( IsOwner( from ) )
{
@ -1074,11 +1074,11 @@ namespace Server.Mobiles
public void OpenBackpack( Mobile from )
{
if ( this.Backpack != null )
if ( Backpack != null )
{
SayTo( from, IsOwner( from ) ? 1010642 : 503208 ); // Take a look at my/your goods.
this.Backpack.DisplayTo( from );
Backpack.DisplayTo( from );
}
}
@ -1172,7 +1172,7 @@ namespace Server.Mobiles
public void Dismiss( Mobile from )
{
Container pack = this.Backpack;
Container pack = Backpack;
if ( pack != null && pack.Items.Count > 0 )
{
@ -1207,7 +1207,7 @@ namespace Server.Mobiles
public bool CheckTeleport( Mobile to )
{
if ( Deleted || !IsOwner( to ) || House == null || this.Map == Map.Internal )
if ( Deleted || !IsOwner( to ) || House == null || Map == Map.Internal )
return false;
if ( House.IsInside( to ) || to.Map != House.Map || !House.InRange( to, 5 ) )
@ -1216,9 +1216,9 @@ namespace Server.Mobiles
if ( Placeholder == null )
{
Placeholder = new PlayerVendorPlaceholder( this );
Placeholder.MoveToWorld( this.Location, this.Map );
Placeholder.MoveToWorld( Location, Map );
this.MoveToWorld( to.Location, to.Map );
MoveToWorld( to.Location, to.Map );
to.SendLocalizedMessage( 1062431 ); // This vendor has been moved out of the house to your current location temporarily. The vendor will return home automatically after two minutes have passed once you are done managing its inventory or customizing it.
}
@ -1273,7 +1273,7 @@ namespace Server.Mobiles
public bool WasNamed( string speech )
{
return this.Name != null && Insensitive.StartsWith( speech, this.Name );
return Name != null && Insensitive.StartsWith( speech, Name );
}
public override void OnSpeech( SpeechEventArgs e )
@ -1356,7 +1356,7 @@ namespace Server.Mobiles
{
if ( IsOwner( from ) )
{
this.Direction = this.GetDirectionTo( from );
Direction = GetDirectionTo( from );
e.Handled = true;
}
@ -1384,7 +1384,7 @@ namespace Server.Mobiles
protected override void OnTick()
{
m_Vendor.m_NextPayTime = DateTime.UtcNow + this.Interval;
m_Vendor.m_NextPayTime = DateTime.UtcNow + Interval;
int pay;
int totalGold;
@ -1710,7 +1710,7 @@ namespace Server.Mobiles
{
if ( m_Vendor != null && !m_Vendor.Deleted )
{
m_Vendor.MoveToWorld( this.Location, this.Map );
m_Vendor.MoveToWorld( Location, Map );
m_Vendor.Placeholder = null;
}
}