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

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

4
Scripts/Items/Traps/BaseTrap.cs
View file

@ -19,7 +19,7 @@ namespace Server.Items
public virtual int GetEffectHue()
{
int hue = this.Hue & 0x3FFF;
int hue = Hue & 0x3FFF;
if ( hue < 2 )
return 0;
@ -34,7 +34,7 @@ namespace Server.Items
public bool CheckRange( Point3D loc, int range )
{
return ( (this.Z + 8) >= loc.Z && (loc.Z + 16) > this.Z )
return ( (Z + 8) >= loc.Z && (loc.Z + 16) > Z )
&& Utility.InRange( GetWorldLocation(), loc, range );
}

6
Scripts/Items/Traps/FlameSpurtTrap.cs
View file

@ -28,7 +28,7 @@ namespace Server.Items
public virtual void CheckTimer()
{
Map map = this.Map;
Map map = Map;
if ( map != null && map.GetSector( GetWorldLocation() ).Active )
StartTimer();
@ -84,7 +84,7 @@ namespace Server.Items
if ( !mob.Player || !mob.Alive || mob.AccessLevel > AccessLevel.Player )
continue;
if ( ( (this.Z + 8) >= mob.Z && (mob.Z + 16) > this.Z ) )
if ( ( (Z + 8) >= mob.Z && (mob.Z + 16) > Z ) )
{
foundPlayer = true;
break;
@ -101,7 +101,7 @@ namespace Server.Items
else if ( m_Spurt == null || m_Spurt.Deleted )
{
m_Spurt = new Static( 0x3709 );
m_Spurt.MoveToWorld( this.Location, this.Map );
m_Spurt.MoveToWorld( Location, Map );
Effects.PlaySound( GetWorldLocation(), Map, 0x309 );
}

2
Scripts/Items/Traps/GasTrap.cs
View file

@ -81,7 +81,7 @@ namespace Server.Items
if ( m_Poison == null || !from.Player || !from.Alive || from.AccessLevel > AccessLevel.Player )
return;
Effects.SendLocationEffect( Location, Map, GetBaseID( this.Type ) - 2, 16, 3, GetEffectHue(), 0 );
Effects.SendLocationEffect( Location, Map, GetBaseID( Type ) - 2, 16, 3, GetEffectHue(), 0 );
Effects.PlaySound( Location, Map, 0x231 );
from.ApplyPoison( from, m_Poison );

2
Scripts/Items/Traps/SawTrap.cs
View file

@ -64,7 +64,7 @@ namespace Server.Items
if ( !from.Alive || from.AccessLevel > AccessLevel.Player )
return;
Effects.SendLocationEffect( Location, Map, GetBaseID( this.Type ) + 1, 6, 3, GetEffectHue(), 0 );
Effects.SendLocationEffect( Location, Map, GetBaseID( Type ) + 1, 6, 3, GetEffectHue(), 0 );
Effects.PlaySound( Location, Map, 0x21C );
Spells.SpellHelper.Damage( TimeSpan.FromTicks( 1 ), from, from, Utility.RandomMinMax( 5, 15 ) );

12
Scripts/Items/Traps/SpikeTrap.cs
View file

@ -30,7 +30,7 @@ namespace Server.Items
}
set
{
bool extended = this.Extended;
bool extended = Extended;
ItemID = ( extended ? GetExtendedID( value ) : GetBaseID( value ) );
}
@ -38,13 +38,13 @@ namespace Server.Items
public bool Extended
{
get => ( ItemID == GetExtendedID( this.Type ) );
get => ( ItemID == GetExtendedID( Type ) );
set
{
if ( value )
ItemID = GetExtendedID( this.Type );
ItemID = GetExtendedID( Type );
else
ItemID = GetBaseID( this.Type );
ItemID = GetBaseID( Type );
}
}
@ -100,7 +100,7 @@ namespace Server.Items
if ( !from.Alive || from.AccessLevel > AccessLevel.Player )
return;
Effects.SendLocationEffect( Location, Map, GetBaseID( this.Type ) + 1, 18, 3, GetEffectHue(), 0 );
Effects.SendLocationEffect( Location, Map, GetBaseID( Type ) + 1, 18, 3, GetEffectHue(), 0 );
Effects.PlaySound( Location, Map, 0x22C );
foreach ( Mobile mob in GetMobilesInRange( 0 ) )
@ -123,7 +123,7 @@ namespace Server.Items
public virtual void OnSpikeRetracted()
{
Extended = false;
Effects.SendLocationEffect( Location, Map, GetExtendedID( this.Type ) - 1, 6, 3, GetEffectHue(), 0 );
Effects.SendLocationEffect( Location, Map, GetExtendedID( Type ) - 1, 6, 3, GetEffectHue(), 0 );
}
public SpikeTrap( Serial serial ) : base( serial )

8
Scripts/Items/Traps/StoneFaceTrap.cs
View file

@ -27,7 +27,7 @@ namespace Server.Items
}
set
{
bool breathing = this.Breathing;
bool breathing = Breathing;
ItemID = ( breathing ? GetFireID( value ) : GetBaseID( value ) );
}
@ -35,13 +35,13 @@ namespace Server.Items
public bool Breathing
{
get => ( ItemID == GetFireID( this.Type ) );
get => ( ItemID == GetFireID( Type ) );
set
{
if ( value )
ItemID = GetFireID( this.Type );
ItemID = GetFireID( Type );
else
ItemID = GetBaseID( this.Type );
ItemID = GetBaseID( Type );
}
}