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

10
Scripts/Mobiles/Monsters/Humanoid/Magic/Betrayer.cs
View file

@ -109,10 +109,10 @@ namespace Server.Mobiles
m_Stunning = true;
defender.Animate( 21, 6, 1, true, false, 0 );
this.PlaySound( 0xEE );
PlaySound( 0xEE );
defender.LocalOverheadMessage( MessageType.Regular, 0x3B2, false, "You have been stunned by a colossal blow!" );
if ( this.Weapon is BaseWeapon weapon )
if ( Weapon is BaseWeapon weapon )
weapon.OnHit( this, defender );
if ( defender.Alive )
@ -148,10 +148,10 @@ namespace Server.Mobiles
if ( Utility.RandomBool() )
{
this.FixedParticles( 0x376A, 9, 32, 0x2539, EffectLayer.LeftHand );
this.PlaySound( 0x1DE );
FixedParticles( 0x376A, 9, 32, 0x2539, EffectLayer.LeftHand );
PlaySound( 0x1DE );
foreach ( Mobile m in this.GetMobilesInRange( 2 ) )
foreach ( Mobile m in GetMobilesInRange( 2 ) )
{
if ( m != this && IsEnemy( m ) )
{

4
Scripts/Mobiles/Monsters/Humanoid/Magic/GargoyleDestroyer.cs
View file

@ -80,8 +80,8 @@ namespace Server.Mobiles
public void ThrowHatchet( Mobile to )
{
int damage = 50;
this.MovingEffect( to, 0xF43, 10, 0, false, false );
this.DoHarmful( to );
MovingEffect( to, 0xF43, 10, 0, false, false );
DoHarmful( to );
AOS.Damage( to, this, damage, 100, 0, 0, 0, 0 );
}

6
Scripts/Mobiles/Monsters/Humanoid/Magic/SavageShaman.cs
View file

@ -110,12 +110,12 @@ namespace Server.Mobiles
public void BeginSavageDance()
{
if ( this.Map == null )
if ( Map == null )
return;
ArrayList list = new ArrayList();
foreach ( Mobile m in this.GetMobilesInRange( 8 ) )
foreach ( Mobile m in GetMobilesInRange( 8 ) )
{
if ( m != this && m is SavageShaman )
list.Add( m );
@ -149,7 +149,7 @@ namespace Server.Mobiles
ArrayList list = new ArrayList();
foreach ( Mobile m in this.GetMobilesInRange( 8 ) )
foreach ( Mobile m in GetMobilesInRange( 8 ) )
list.Add( m );
if ( list.Count > 0 )

4
Scripts/Mobiles/Monsters/Humanoid/Magic/Succubus.cs
View file

@ -56,12 +56,12 @@ namespace Server.Mobiles
{
ArrayList list = new ArrayList();
foreach ( Mobile m in this.GetMobilesInRange( 2 ) )
foreach ( Mobile m in GetMobilesInRange( 2 ) )
{
if ( m == this || !CanBeHarmful( m ) )
continue;
if ( m is BaseCreature creature && (creature.Controlled || creature.Summoned || creature.Team != this.Team) )
if ( m is BaseCreature creature && (creature.Controlled || creature.Summoned || creature.Team != Team) )
list.Add( m );
else if ( m.Player )
list.Add( m );

2
Scripts/Mobiles/Monsters/Humanoid/Melee/Brigand.cs
View file

@ -13,7 +13,7 @@ namespace Server.Mobiles
Title = "the brigand";
Hue = Utility.RandomSkinHue();
if ( this.Female = Utility.RandomBool() )
if ( Female = Utility.RandomBool() )
{
Body = 0x191;
Name = NameList.RandomName( "female" );

2
Scripts/Mobiles/Monsters/Humanoid/Melee/ElfBrigand.cs
View file

@ -15,7 +15,7 @@ namespace Server.Mobiles
Race = Race.Elf;
Hue = Race.RandomSkinHue();
if ( this.Female = Utility.RandomBool() )
if ( Female = Utility.RandomBool() )
{
Body = 0x25E;
Name = NameList.RandomName( "female elf brigand" );

10
Scripts/Mobiles/Monsters/Humanoid/Melee/Executioner.cs
View file

@ -11,16 +11,16 @@ namespace Server.Mobiles
Title = "the executioner";
Hue = Utility.RandomSkinHue();
if ( this.Female = Utility.RandomBool() )
if ( Female = Utility.RandomBool() )
{
this.Body = 0x191;
this.Name = NameList.RandomName( "female" );
Body = 0x191;
Name = NameList.RandomName( "female" );
AddItem( new Skirt( Utility.RandomRedHue() ) );
}
else
{
this.Body = 0x190;
this.Name = NameList.RandomName( "male" );
Body = 0x190;
Name = NameList.RandomName( "male" );
AddItem( new ShortPants( Utility.RandomRedHue() ) );
}

4
Scripts/Mobiles/Monsters/Humanoid/Melee/Juggernaut.cs
View file

@ -107,10 +107,10 @@ namespace Server.Mobiles
m_Stunning = true;
defender.Animate( 21, 6, 1, true, false, 0 );
this.PlaySound( 0xEE );
PlaySound( 0xEE );
defender.LocalOverheadMessage( MessageType.Regular, 0x3B2, false, "You have been stunned by a colossal blow!" );
if ( this.Weapon is BaseWeapon weapon )
if ( Weapon is BaseWeapon weapon )
weapon.OnHit( this, defender );
if ( defender.Alive )

4
Scripts/Mobiles/Monsters/Humanoid/Melee/KhaldunSummoner.cs
View file

@ -98,8 +98,8 @@ namespace Server.Mobiles
public override bool OnBeforeDeath()
{
BoneMagi rm = new BoneMagi();
rm.Team = this.Team;
rm.Combatant = this.Combatant;
rm.Team = Team;
rm.Combatant = Combatant;
rm.NoKillAwards = true;
if ( rm.Backpack == null )

4
Scripts/Mobiles/Monsters/Humanoid/Melee/KhaldunZealot.cs
View file

@ -107,8 +107,8 @@ namespace Server.Mobiles
public override bool OnBeforeDeath()
{
BoneKnight rm = new BoneKnight();
rm.Team = this.Team;
rm.Combatant = this.Combatant;
rm.Team = Team;
rm.Combatant = Combatant;
rm.NoKillAwards = true;
if ( rm.Backpack == null )

2
Scripts/Mobiles/Monsters/Humanoid/Melee/OrcBomber.cs
View file

@ -114,7 +114,7 @@ namespace Server.Mobiles
{
DoHarmful( m );
this.MovingParticles( m, 0x1C19, 1, 0, false, true, 0, 0, 9502, 6014, 0x11D, EffectLayer.Waist, 0 );
MovingParticles( m, 0x1C19, 1, 0, false, true, 0, 0, 9502, 6014, 0x11D, EffectLayer.Waist, 0 );
new InternalTimer( m, this ).Start();
}

6
Scripts/Mobiles/Monsters/Humanoid/Melee/OrcBrute.cs
View file

@ -106,7 +106,7 @@ namespace Server.Mobiles
int orcs = 0;
foreach ( Mobile m in this.GetMobilesInRange( 10 ) )
foreach ( Mobile m in GetMobilesInRange( 10 ) )
{
if ( m is OrcishLord )
++orcs;
@ -116,7 +116,7 @@ namespace Server.Mobiles
{
BaseCreature orc = new SpawnedOrcishLord();
orc.Team = this.Team;
orc.Team = Team;
Point3D loc = target.Location;
bool validLocation = false;
@ -127,7 +127,7 @@ namespace Server.Mobiles
int y = target.Y + Utility.Random( 3 ) - 1;
int z = map.GetAverageZ( x, y );
if ( validLocation = map.CanFit( x, y, this.Z, 16, false, false ) )
if ( validLocation = map.CanFit( x, y, Z, 16, false, false ) )
loc = new Point3D( x, y, Z );
else if ( validLocation = map.CanFit( x, y, z, 16, false, false ) )
loc = new Point3D( x, y, z );

2
Scripts/Mobiles/Monsters/Humanoid/Melee/RestlessSoul.cs
View file

@ -61,7 +61,7 @@ namespace Server.Mobiles
for ( int i = 0; i < list.Count; ++i )
{
if ( list[i] is ContextMenus.PaperdollEntry )
if ( list[i] is PaperdollEntry )
list.RemoveAt( i-- );
}
}

2
Scripts/Mobiles/Monsters/Humanoid/Melee/SavageRider.cs
View file

@ -61,7 +61,7 @@ namespace Server.Mobiles
public override bool OnBeforeDeath()
{
IMount mount = this.Mount;
IMount mount = Mount;
if ( mount != null )
mount.Rider = null;

2
Scripts/Mobiles/Monsters/Humanoid/Melee/SpawnedOrcishLord.cs
View file

@ -8,7 +8,7 @@ namespace Server.Mobiles
[Constructible]
public SpawnedOrcishLord()
{
Container pack = this.Backpack;
Container pack = Backpack;
if ( pack != null )
pack.Delete();