Removes implicit this.

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

View file

@ -246,7 +246,7 @@ namespace Server.Items
if (qs is Haven.UzeraanTurmoilQuest)
{
var obj = qs.FindObjective(typeof(Engines.Quests.Haven.CashBankCheckObjective));
var obj = qs.FindObjective(typeof(Haven.CashBankCheckObjective));
if (obj != null && !obj.Completed)
{

View file

@ -43,7 +43,7 @@ namespace Server.Items
{
public GMItemPacket( Item item ) : base( 0x1A )
{
this.EnsureCapacity( 20 );
EnsureCapacity( 20 );
// 14 base length
// +2 - Amount

View file

@ -42,7 +42,7 @@ namespace Server.Items
{
from.SendLocalizedMessage( 1040016 ); // You cannot use this while riding a mount
}
else if ( Server.Spells.Ninjitsu.AnimalForm.UnderTransformation( from ) )
else if ( Spells.Ninjitsu.AnimalForm.UnderTransformation( from ) )
{
from.SendLocalizedMessage( 1070902 ); // You can't use this while in an animal form!
}
@ -80,7 +80,7 @@ namespace Server.Items
if (to is PlayerMobile mobile)
{
if (Server.Spells.Ninjitsu.AnimalForm.UnderTransformation(mobile))
if (Spells.Ninjitsu.AnimalForm.UnderTransformation(mobile))
{
mobile.SendLocalizedMessage(1114066, from.Name); // ~1_NAME~ knocked you out of animal form!
}
@ -172,11 +172,11 @@ namespace Server.Items
{
from.SendLocalizedMessage( 1040016 ); // You cannot use this while riding a mount
}
else if ( Server.Spells.Ninjitsu.AnimalForm.UnderTransformation( from ) )
else if ( Spells.Ninjitsu.AnimalForm.UnderTransformation( from ) )
{
from.SendLocalizedMessage( 1070902 ); // You can't use this while in an animal form!
}
else if (!to.Mounted && !Server.Spells.Ninjitsu.AnimalForm.UnderTransformation(to))
else if (!to.Mounted && !Spells.Ninjitsu.AnimalForm.UnderTransformation(to))
{
from.SendLocalizedMessage( 1049628 ); // You have no reason to throw a bola at that.
}

View file

@ -78,7 +78,7 @@ namespace Server.Items
public virtual void Cleanup()
{
List<Item> items = this.Items;
List<Item> items = Items;
for ( int i = items.Count - 1; i >= 0; --i )
{
@ -99,7 +99,7 @@ namespace Server.Items
private void RecurseDelete( BulletinMessage msg )
{
List<Item> found = new List<Item>();
List<Item> items = this.Items;
List<Item> items = Items;
for ( int i = items.Count - 1; i >= 0; --i )
{
@ -122,7 +122,7 @@ namespace Server.Items
public virtual bool GetLastPostTime( Mobile poster, bool onlyCheckRoot, ref DateTime lastPostTime )
{
List<Item> items = this.Items;
List<Item> items = Items;
bool wasSet = false;
for ( int i = 0; i < items.Count; ++i )
@ -168,7 +168,7 @@ namespace Server.Items
if ( from.AccessLevel >= AccessLevel.GameMaster )
return true;
return ( from.Map == this.Map && from.InRange( GetWorldLocation(), 2 ) );
return ( from.Map == Map && from.InRange( GetWorldLocation(), 2 ) );
}
public void PostMessage( Mobile from, BulletinMessage thread, string subject, string[] lines )
@ -331,7 +331,7 @@ namespace Server.Items
return m_Time.ToString( "MMM dd, yyyy" );
}
public override bool CheckTarget( Mobile from, Server.Targeting.Target targ, object targeted )
public override bool CheckTarget( Mobile from, Targeting.Target targ, object targeted )
{
return false;
}

View file

@ -55,10 +55,10 @@ namespace Server.Items
[CommandProperty( AccessLevel.GameMaster )]
public bool Active
{
get => this.ItemID == 0x1ECD;
get => ItemID == 0x1ECD;
set
{
this.ItemID = value ? 0x1ECD : 0x1ED0;
ItemID = value ? 0x1ECD : 0x1ED0;
InvalidateProperties();
}
}
@ -99,9 +99,9 @@ namespace Server.Items
{
base.GetProperties( list );
list.Add( this.Active ? 1060742 : 1060743 ); // active / inactive
list.Add( Active ? 1060742 : 1060743 ); // active / inactive
list.Add( 1060745 ); // broadcast
list.Add( 1060741, this.Charges.ToString() ); // charges: ~1_val~
list.Add( 1060741, Charges.ToString() ); // charges: ~1_val~
if ( Receivers.Count > 0 )
list.Add( 1060746, Receivers.Count.ToString() ); // links: ~1_val~
@ -111,9 +111,9 @@ namespace Server.Items
{
base.OnSingleClick( from );
LabelTo( from, this.Active ? 1060742 : 1060743 ); // active / inactive
LabelTo( from, Active ? 1060742 : 1060743 ); // active / inactive
LabelTo( from, 1060745 ); // broadcast
LabelTo( from, 1060741, this.Charges.ToString() ); // charges: ~1_val~
LabelTo( from, 1060741, Charges.ToString() ); // charges: ~1_val~
if ( Receivers.Count > 0 )
LabelTo( from, 1060746, Receivers.Count.ToString() ); // links: ~1_val~
@ -145,7 +145,7 @@ namespace Server.Items
}
else
{
this.Active = false;
Active = false;
break;
}
}
@ -298,10 +298,10 @@ namespace Server.Items
[CommandProperty( AccessLevel.GameMaster )]
public bool Active
{
get => this.ItemID == 0x1ED1;
get => ItemID == 0x1ED1;
set
{
this.ItemID = value ? 0x1ED1 : 0x1ED0;
ItemID = value ? 0x1ED1 : 0x1ED0;
InvalidateProperties();
}
}
@ -342,7 +342,7 @@ namespace Server.Items
{
base.GetProperties( list );
list.Add( this.Active ? 1060742 : 1060743 ); // active / inactive
list.Add( Active ? 1060742 : 1060743 ); // active / inactive
list.Add( 1060744 ); // receiver
}
@ -350,22 +350,22 @@ namespace Server.Items
{
base.OnSingleClick( from );
LabelTo( from, this.Active ? 1060742 : 1060743 ); // active / inactive
LabelTo( from, Active ? 1060742 : 1060743 ); // active / inactive
LabelTo( from, 1060744 ); // receiver
}
public void TransmitMessage( Mobile from, string message )
{
if ( !this.Active )
if ( !Active )
return;
string text = String.Format( "{0} says {1}", from.Name, message );
if ( this.RootParent is Mobile mobile )
if ( RootParent is Mobile mobile )
{
mobile.SendMessage( 0x2B2, "Crystal: " + text );
}
else if ( this.RootParent is Item item )
else if ( RootParent is Item item )
{
item.PublicOverheadMessage( MessageType.Regular, 0x2B2, false, "Crystal: " + text );
}

View file

@ -159,7 +159,7 @@ namespace Server.Items
private void AssignInstancedLoot()
{
if ( m_Aggressors.Count == 0 || this.Items.Count == 0 )
if ( m_Aggressors.Count == 0 || Items.Count == 0 )
return;
if ( m_InstancedItems == null )
@ -168,9 +168,9 @@ namespace Server.Items
List<Item> m_Stackables = new List<Item>();
List<Item> m_Unstackables = new List<Item>();
for ( int i = 0; i < this.Items.Count; i++ )
for ( int i = 0; i < Items.Count; i++ )
{
Item item = this.Items[i];
Item item = Items[i];
if ( item.LootType != LootType.Cursed ) //Don't have curesd items take up someone's item spot.. (?)
{
@ -240,9 +240,9 @@ namespace Server.Items
public void AddCarvedItem( Item carved, Mobile carver )
{
this.DropItem( carved );
DropItem( carved );
if ( this.InstancedCorpse )
if ( InstancedCorpse )
{
if ( m_InstancedItems == null )
m_InstancedItems = new Dictionary<Item, InstancedItemInfo>();
@ -954,7 +954,7 @@ namespace Server.Items
if ( !IsCriminalAction( from ) )
return true;
Map map = this.Map;
Map map = Map;
if ( map == null || (map.Rules & MapRules.HarmfulRestrictions) != 0 )
return false;
@ -986,10 +986,10 @@ namespace Server.Items
public virtual void Open( Mobile from, bool checkSelfLoot )
{
if ( from.AccessLevel > AccessLevel.Player || from.InRange( this.GetWorldLocation(), 2 ) )
if ( from.AccessLevel > AccessLevel.Player || from.InRange( GetWorldLocation(), 2 ) )
{
#region Self Looting
if ( checkSelfLoot && from == m_Owner && !GetFlag( CorpseFlag.SelfLooted ) && this.Items.Count != 0 )
if ( checkSelfLoot && from == m_Owner && !GetFlag( CorpseFlag.SelfLooted ) && Items.Count != 0 )
{
if ( from.FindItemOnLayer( Layer.OuterTorso ) is DeathRobe robe )
{
@ -1017,7 +1017,7 @@ namespace Server.Items
}
}
List<Item> items = new List<Item>( this.Items );
List<Item> items = new List<Item>( Items );
bool didntFit = false;
@ -1045,7 +1045,7 @@ namespace Server.Items
from.PlaySound( 0x3E3 );
if ( this.Items.Count != 0 )
if ( Items.Count != 0 )
{
from.SendLocalizedMessage( 1062472 ); // You gather some of your belongings. The rest remain on the corpse.
}
@ -1152,18 +1152,18 @@ namespace Server.Items
if ( m_CorpseName != null )
list.Add( m_CorpseName );
else
list.Add( 1046414, this.Name ); // the remains of ~1_NAME~
list.Add( 1046414, Name ); // the remains of ~1_NAME~
}
else // Bone form
{
list.Add( 1046414, this.Name ); // the remains of ~1_NAME~
list.Add( 1046414, Name ); // the remains of ~1_NAME~
}
}
public override void OnAosSingleClick( Mobile from )
{
int hue = Notoriety.GetHue( NotorietyHandlers.CorpseNotoriety( from, this ) );
ObjectPropertyList opl = this.PropertyList;
ObjectPropertyList opl = PropertyList;
if ( opl.Header > 0 )
from.Send( new MessageLocalized( Serial, ItemID, MessageType.Label, hue, 3, opl.Header, Name, opl.HeaderArgs ) );
@ -1188,7 +1188,7 @@ namespace Server.Items
public void Carve( Mobile from, Item item )
{
if ( IsCriminalAction( from ) && this.Map != null && (this.Map.Rules & MapRules.HarmfulRestrictions) != 0 )
if ( IsCriminalAction( from ) && Map != null && (Map.Rules & MapRules.HarmfulRestrictions) != 0 )
{
if ( m_Owner == null || !m_Owner.Player )
from.SendLocalizedMessage( 1005035 ); // You did not earn the right to loot this creature!

View file

@ -68,7 +68,7 @@ namespace Server.Items
public override void OnSingleClick( Mobile from )
{
this.LabelTo( from, 1046414, Name ); // the remains of ~1_NAME~
LabelTo( from, 1046414, Name ); // the remains of ~1_NAME~
}
public DecayedCorpse( Serial serial ) : base( serial )

View file

@ -162,13 +162,13 @@ namespace Server.Items
int y = Location.Y + (Utility.Random( (m_SpawnRange * 2) + 1 ) - m_SpawnRange);
int z = Map.GetAverageZ( x, y );
if ( Map.CanSpawnMobile( new Point2D( x, y ), this.Z ) )
return new Point3D( x, y, this.Z );
if ( Map.CanSpawnMobile( new Point2D( x, y ), Z ) )
return new Point3D( x, y, Z );
else if ( Map.CanSpawnMobile( new Point2D( x, y ), z ) )
return new Point3D( x, y, z );
}
return this.Location;
return Location;
}
public virtual void DoEffect( Point3D loc, Map map )
@ -185,7 +185,7 @@ namespace Server.Items
{
if ( m_NextSpawn < DateTime.UtcNow )
{
Map map = this.Map;
Map map = Map;
BaseCreature bc = (BaseCreature)Activator.CreateInstance( m_Creatures[Utility.Random( m_Creatures.Length )] );
if ( bc != null )

View file

@ -41,7 +41,7 @@ namespace Server.Items
protected override void OnAmountChange( int oldValue )
{
int newValue = this.Amount;
int newValue = Amount;
UpdateTotal( this, TotalType.Gold, newValue - oldValue );
}
@ -119,7 +119,7 @@ namespace Server.Items
int baseTotal = base.GetTotal( type );
if ( type == TotalType.Gold )
baseTotal += this.Amount;
baseTotal += Amount;
return baseTotal;
}

View file

@ -16,13 +16,13 @@ namespace Server.Items
public override void OnDoubleClick( Mobile from )
{
if ( !from.InRange( this.GetWorldLocation(), 2 ) || !from.InLOS( this ) )
if ( !from.InRange( GetWorldLocation(), 2 ) || !from.InLOS( this ) )
{
from.LocalOverheadMessage( MessageType.Regular, 0x3B2, 1019045 ); // I can't reach that
}
else if ( Visible && ( ItemID == 4656 || ItemID == 4702 ) && DateTime.UtcNow >= m_NextUse )
{
Point3D p = this.GetWorldLocation();
Point3D p = GetWorldLocation();
if ( 1 > Utility.Random( Math.Max( Math.Abs( from.X - p.X ), Math.Abs( from.Y - p.Y ) ) ) )
{
@ -31,7 +31,7 @@ namespace Server.Items
Spells.SpellHelper.Damage( TimeSpan.FromSeconds( 0.5 ), from, Utility.Dice( 2, 10, 5 ) );
}
Effects.PlaySound( this.GetWorldLocation(), this.Map, 0x387 );
Effects.PlaySound( GetWorldLocation(), Map, 0x387 );
Timer.DelayCall( TimeSpan.FromSeconds( 0.25 ), new TimerCallback( Down1 ) );
Timer.DelayCall( TimeSpan.FromSeconds( 0.50 ), new TimerCallback( Down2 ) );
@ -51,8 +51,8 @@ namespace Server.Items
{
ItemID = ( ItemID == 4678 ? 4679 : 4713 );
Point3D p = this.GetWorldLocation();
Map f = this.Map;
Point3D p = GetWorldLocation();
Map f = Map;
if ( f == null )
return;

View file

@ -33,7 +33,7 @@ namespace Server.Items
public override void OnDoubleClick( Mobile from )
{
if ( from.InRange( this.GetWorldLocation(), 1 ) )
if ( from.InRange( GetWorldLocation(), 1 ) )
{
from.CloseGump( typeof( HairDyeGump ) );
from.SendGump( new HairDyeGump( this ) );

View file

@ -61,7 +61,7 @@ namespace Server.Items
if ( !CheckUse( this, from ) )
return;
if ( from.FindGump( typeof( InteriorDecorator.InternalGump ) ) == null )
if ( from.FindGump( typeof( InternalGump ) ) == null )
from.SendGump( new InternalGump( this ) );
if ( m_Command != DecorateCommand.None )
@ -148,7 +148,7 @@ namespace Server.Items
protected override void OnTarget( Mobile from, object targeted )
{
if ( targeted is Item item && InteriorDecorator.CheckUse( m_Decorator, from ) )
if ( targeted is Item item && CheckUse( m_Decorator, from ) )
{
BaseHouse house = BaseHouse.FindHouseAt( from );
@ -226,7 +226,7 @@ namespace Server.Items
protected override void OnTargetCancel( Mobile from, TargetCancelType cancelType )
{
if ( cancelType == TargetCancelType.Canceled )
from.CloseGump( typeof( InteriorDecorator.InternalGump ) );
from.CloseGump( typeof( InternalGump ) );
}
private static void Turn( Item item, Mobile from )

View file

@ -212,7 +212,7 @@ namespace Server.Items
public override void OnDoubleClick( Mobile from )
{
if ( !this.IsChildOf( from.Backpack ) )
if ( !IsChildOf( from.Backpack ) )
{
from.SendLocalizedMessage( 501661 ); // That key is unreachable.
return;
@ -268,7 +268,7 @@ namespace Server.Items
public bool UseOn( Mobile from, ILockable o )
{
if ( o.KeyValue == this.KeyValue )
if ( o.KeyValue == KeyValue )
{
if ( o is BaseDoor door && !door.UseLocks() )
return false;

View file

@ -21,7 +21,7 @@ namespace Server.Items
public override bool OnDragDrop( Mobile from, Item dropped )
{
if ( !this.IsChildOf( from.Backpack ) )
if ( !IsChildOf( from.Backpack ) )
{
from.SendLocalizedMessage( 1060640 ); // The item must be in your backpack to use it.
return false;
@ -32,7 +32,7 @@ namespace Server.Items
from.SendLocalizedMessage( 501689 ); // Only non-blank keys can be put on a keyring.
return false;
}
if ( this.Keys.Count >= MaxKeys )
if ( Keys.Count >= MaxKeys )
{
from.SendLocalizedMessage( 1008138 ); // This keyring is full.
return false;
@ -45,7 +45,7 @@ namespace Server.Items
public override void OnDoubleClick( Mobile from )
{
if ( !this.IsChildOf( from.Backpack ) )
if ( !IsChildOf( from.Backpack ) )
{
from.SendLocalizedMessage( 1060640 ); // The item must be in your backpack to use it.
return;
@ -116,7 +116,7 @@ namespace Server.Items
public void Open( Mobile from )
{
if ( !(this.Parent is Container cont) )
if ( !(Parent is Container cont) )
return;
for ( int i = m_Keys.Count - 1; i >= 0; i-- )
@ -161,14 +161,14 @@ namespace Server.Items
private void UpdateItemID()
{
if ( this.Keys.Count < 1 )
this.ItemID = 0x1011;
else if ( this.Keys.Count < 3 )
this.ItemID = 0x1769;
else if ( this.Keys.Count < 5 )
this.ItemID = 0x176A;
if ( Keys.Count < 1 )
ItemID = 0x1011;
else if ( Keys.Count < 3 )
ItemID = 0x1769;
else if ( Keys.Count < 5 )
ItemID = 0x176A;
else
this.ItemID = 0x176B;
ItemID = 0x176B;
}
public KeyRing( Serial serial ) : base( serial )

View file

@ -46,14 +46,14 @@ namespace Server.Items
int version = reader.ReadInt();
if ( version < 1 && ItemID == 0x2199 )
this.ItemID = 0x21A2;
ItemID = 0x21A2;
}
public sealed class GMItemPacket : Packet
{
public GMItemPacket( Item item ) : base( 0x1A )
{
this.EnsureCapacity( 20 );
EnsureCapacity( 20 );
// 14 base length
// +2 - Amount

View file

@ -21,7 +21,7 @@ namespace Server.Items
}
else
{
this.Delete();
Delete();
Item i = null;

View file

@ -187,7 +187,7 @@ namespace Server.Items
if ( house == null || !house.IsLockedDown( this ) )
from.SendLocalizedMessage( 1062396 ); // This bulletin board must be locked down in a house to be usable.
else if ( !from.InRange( this.GetWorldLocation(), 2 ) || !from.InLOS( this ) )
else if ( !from.InRange( GetWorldLocation(), 2 ) || !from.InLOS( this ) )
from.LocalOverheadMessage( MessageType.Regular, 0x3B2, 1019045 ); // I can't reach that.
else if ( CheckAccess( house, from ) )
from.SendGump( new PlayerBBGump( from, house, this, 0 ) );

View file

@ -49,7 +49,7 @@ namespace Server.Items
v.SayTo( from, 503246 ); // Ah! it feels good to be working again.
this.Delete();
Delete();
}
else
{
@ -93,7 +93,7 @@ namespace Server.Items
v.SayTo( from, 503246 ); // Ah! it feels good to be working again.
this.Delete();
Delete();
}
}
}

View file

@ -18,7 +18,7 @@ namespace Server.Items
public override void OnDoubleClick( Mobile from )
{
if ( !from.InRange( this.GetWorldLocation(), 3 ))
if ( !from.InRange( GetWorldLocation(), 3 ))
from.LocalOverheadMessage( MessageType.Regular, 0x3B2, 1019045 ); // I can't reach that.
else
from.SendAsciiMessage( "This looks like part of a larger contraption." );

View file

@ -49,7 +49,7 @@ namespace Server.Items
{
if ( m is PlayerMobile )
{
if ( !Utility.InRange( m.Location, this.Location, 1 ) && Utility.InRange( oldLocation, this.Location, 1 ) )
if ( !Utility.InRange( m.Location, Location, 1 ) && Utility.InRange( oldLocation, Location, 1 ) )
m.CloseGump( typeof( MoongateGump ) );
}
}

View file

@ -53,14 +53,14 @@ namespace Server.Items
{
Mobile from = e.Mobile;
if ( !e.Handled && from.InRange( this, 10 ) && e.Speech.ToLower() == this.Word )
if ( !e.Handled && from.InRange( this, 10 ) && e.Speech.ToLower() == Word )
{
BaseBoat boat = BaseBoat.FindBoatAt( from, from.Map );
if ( boat == null )
return;
if ( !this.Active )
if ( !Active )
{
if ( boat.TillerMan != null )
boat.TillerMan.Say( 502507 ); // Ar, Legend has it that these pillars are inactive! No man knows how it might be undone!

View file

@ -34,7 +34,7 @@ namespace Server.Items
public override void OnDoubleClick( Mobile from )
{
if ( from.InRange( this.GetWorldLocation(), 1 ) )
if ( from.InRange( GetWorldLocation(), 1 ) )
{
from.CloseGump( typeof( SpecialBeardDyeGump ) );
from.SendGump( new SpecialBeardDyeGump( this ) );

View file

@ -34,7 +34,7 @@ namespace Server.Items
public override void OnDoubleClick( Mobile from )
{
if ( from.InRange( this.GetWorldLocation(), 1 ) )
if ( from.InRange( GetWorldLocation(), 1 ) )
{
from.CloseGump( typeof( SpecialHairDyeGump ) );
from.SendGump( new SpecialHairDyeGump( this ) );

View file

@ -194,7 +194,7 @@ namespace Server.Items
if (p == Point3D.Zero)
p = m.Location;
Server.Mobiles.BaseCreature.TeleportPets(m, p, map);
BaseCreature.TeleportPets(m, p, map);
bool sendEffect = (!m.Hidden || m.AccessLevel == AccessLevel.Player);

View file

@ -105,7 +105,7 @@ namespace Server.Items
public void Empty( int message )
{
List<Item> items = this.Items;
List<Item> items = Items;
if ( items.Count > 0 )
{

View file

@ -101,7 +101,7 @@ namespace Server.Items
m_Broadcasting = true;
SendMessage( triggerer, this.OnlyToTriggerer, m_WarningString, m_WarningNumber );
SendMessage( triggerer, OnlyToTriggerer, m_WarningString, m_WarningNumber );
if ( NeighborRange >= 0 )
{

View file

@ -24,8 +24,8 @@ namespace Server.Items
[Constructible]
public WayPoint() : base( 0x1f14 )
{
this.Hue = 0x498;
this.Visible = false;
Hue = 0x498;
Visible = false;
//this.Movable = false;
}

View file

@ -27,8 +27,8 @@ namespace Server.Items
public override void OnMovement( Mobile m, Point3D oldLocation )
{
if ( m_TurnedOn && IsLockedDown && (!m.Hidden || m.AccessLevel == AccessLevel.Player) && Utility.InRange( m.Location, this.Location, 2 ) && !Utility.InRange( oldLocation, this.Location, 2 ) )
Effects.PlaySound( this.Location, this.Map, m_Sounds[Utility.Random( m_Sounds.Length )] );
if ( m_TurnedOn && IsLockedDown && (!m.Hidden || m.AccessLevel == AccessLevel.Player) && Utility.InRange( m.Location, Location, 2 ) && !Utility.InRange( oldLocation, Location, 2 ) )
Effects.PlaySound( Location, Map, m_Sounds[Utility.Random( m_Sounds.Length )] );
base.OnMovement( m, oldLocation );
}