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

18
Scripts/Mobiles/Monsters/LBR/Exodus/ExodusMinion.cs
View file

@ -113,14 +113,14 @@ namespace Server.Mobiles
if ( !m_FieldActive )
{
// should there be an effect when spells nullifying is on?
this.FixedParticles( 0, 10, 0, 0x2522, EffectLayer.Waist );
FixedParticles( 0, 10, 0, 0x2522, EffectLayer.Waist );
}
else if ( m_FieldActive && !CanUseField )
{
m_FieldActive = false;
// TODO: message and effect when field turns down; cannot be verified on OSI due to a bug
this.FixedParticles( 0x3735, 1, 30, 0x251F, EffectLayer.Waist );
FixedParticles( 0x3735, 1, 30, 0x251F, EffectLayer.Waist );
}
}
@ -130,7 +130,7 @@ namespace Server.Mobiles
if ( m_FieldActive )
{
this.FixedParticles( 0x376A, 20, 10, 0x2530, EffectLayer.Waist );
FixedParticles( 0x376A, 20, 10, 0x2530, EffectLayer.Waist );
PlaySound( 0x2F4 );
@ -156,17 +156,17 @@ namespace Server.Mobiles
{
bool move = base.Move( d );
if ( move && m_FieldActive && this.Combatant != null )
this.FixedParticles( 0, 10, 0, 0x2530, EffectLayer.Waist );
if ( move && m_FieldActive && Combatant != null )
FixedParticles( 0, 10, 0, 0x2530, EffectLayer.Waist );
return move;
}
public void SendEBolt( Mobile to )
{
this.MovingParticles( to, 0x379F, 7, 0, false, true, 0xBE3, 0xFCB, 0x211 );
MovingParticles( to, 0x379F, 7, 0, false, true, 0xBE3, 0xFCB, 0x211 );
to.PlaySound( 0x229 );
this.DoHarmful( to );
DoHarmful( to );
AOS.Damage( to, this, 50, 0, 0, 0, 0, 100 );
}
@ -187,8 +187,8 @@ namespace Server.Mobiles
m_FieldActive = CanUseField;
if ( this.Name == "Exodus Minion" )
this.Name = null;
if ( Name == "Exodus Minion" )
Name = null;
}
}
}

18
Scripts/Mobiles/Monsters/LBR/Exodus/ExodusOverseer.cs
View file

@ -109,14 +109,14 @@ namespace Server.Mobiles
if ( !m_FieldActive )
{
// should there be an effect when spells nullifying is on?
this.FixedParticles( 0, 10, 0, 0x2522, EffectLayer.Waist );
FixedParticles( 0, 10, 0, 0x2522, EffectLayer.Waist );
}
else if ( m_FieldActive && !CanUseField )
{
m_FieldActive = false;
// TODO: message and effect when field turns down; cannot be verified on OSI due to a bug
this.FixedParticles( 0x3735, 1, 30, 0x251F, EffectLayer.Waist );
FixedParticles( 0x3735, 1, 30, 0x251F, EffectLayer.Waist );
}
}
@ -126,7 +126,7 @@ namespace Server.Mobiles
if ( m_FieldActive )
{
this.FixedParticles( 0x376A, 20, 10, 0x2530, EffectLayer.Waist );
FixedParticles( 0x376A, 20, 10, 0x2530, EffectLayer.Waist );
PlaySound( 0x2F4 );
@ -152,17 +152,17 @@ namespace Server.Mobiles
{
bool move = base.Move( d );
if ( move && m_FieldActive && this.Combatant != null )
this.FixedParticles( 0, 10, 0, 0x2530, EffectLayer.Waist );
if ( move && m_FieldActive && Combatant != null )
FixedParticles( 0, 10, 0, 0x2530, EffectLayer.Waist );
return move;
}
public void SendEBolt( Mobile to )
{
this.MovingParticles( to, 0x379F, 7, 0, false, true, 0xBE3, 0xFCB, 0x211 );
MovingParticles( to, 0x379F, 7, 0, false, true, 0xBE3, 0xFCB, 0x211 );
to.PlaySound( 0x229 );
this.DoHarmful( to );
DoHarmful( to );
AOS.Damage( to, this, 50, 0, 0, 0, 0, 100 );
}
@ -183,8 +183,8 @@ namespace Server.Mobiles
m_FieldActive = CanUseField;
if ( this.Name == "Exodus Overseer" )
this.Name = null;
if ( Name == "Exodus Overseer" )
Name = null;
}
}
}

2
Scripts/Mobiles/Monsters/LBR/Jukas/ChaosDragoon.cs
View file

@ -149,7 +149,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/LBR/Jukas/ChaosDragoonElite.cs
View file

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

2
Scripts/Mobiles/Monsters/LBR/Jukas/JukaLord.cs
View file

@ -76,7 +76,7 @@ namespace Server.Mobiles
"{0}!! You will pay for that!"
};
this.Say( true, String.Format( toSay[Utility.Random( toSay.Length )], from.Name ) );
Say( true, String.Format( toSay[Utility.Random( toSay.Length )], from.Name ) );
}
base.OnDamage( amount, from, willKill );

4
Scripts/Mobiles/Monsters/LBR/Jukas/JukaMage.cs
View file

@ -106,7 +106,7 @@ namespace Server.Mobiles
{
JukaLord toBuff = null;
foreach ( Mobile m in this.GetMobilesInRange( 8 ) )
foreach ( Mobile m in GetMobilesInRange( 8 ) )
{
if ( m is JukaLord lord && IsFriend( lord ) && lord.Combatant != null && CanBeBeneficial( lord ) && lord.CanBeginAction( typeof( JukaMage ) ) && InLOS( lord ) )
{
@ -122,7 +122,7 @@ namespace Server.Mobiles
m_NextAbilityTime = DateTime.UtcNow + TimeSpan.FromSeconds( Utility.RandomMinMax( 30, 60 ) );
toBuff.Say( true, "Give me the power to destroy my enemies!" );
this.Say( true, "Fight well my lord!" );
Say( true, "Fight well my lord!" );
DoBeneficial( toBuff );

10
Scripts/Mobiles/Monsters/LBR/Meers/MeerCaptain.cs
View file

@ -109,11 +109,11 @@ namespace Server.Mobiles
public override void OnThink()
{
if ( Combatant != null && this.MagicDamageAbsorb < 1 )
if ( Combatant != null && MagicDamageAbsorb < 1 )
{
this.MagicDamageAbsorb = Utility.RandomMinMax( 5, 7 );
this.FixedParticles( 0x375A, 10, 15, 5037, EffectLayer.Waist );
this.PlaySound( 0x1E9 );
MagicDamageAbsorb = Utility.RandomMinMax( 5, 7 );
FixedParticles( 0x375A, 10, 15, 5037, EffectLayer.Waist );
PlaySound( 0x1E9 );
}
if ( DateTime.UtcNow >= m_NextAbilityTime )
@ -122,7 +122,7 @@ namespace Server.Mobiles
ArrayList list = new ArrayList();
foreach ( Mobile m in this.GetMobilesInRange( 8 ) )
foreach ( Mobile m in GetMobilesInRange( 8 ) )
{
if ( m is MeerWarrior && IsFriend( m ) && CanBeBeneficial( m ) && m.Hits < m.HitsMax && !m.Poisoned && !MortalStrike.IsWounded( m ) )
list.Add( m );

38
Scripts/Mobiles/Monsters/LBR/Meers/MeerEternal.cs
View file

@ -80,8 +80,8 @@ namespace Server.Mobiles
{
m_NextAbilityTime += TimeSpan.FromSeconds( 2.5 );
this.Say( true, "Beware, mortals! You have provoked my wrath!" );
this.FixedParticles( 0x376A, 10, 10, 9537, 33, 0, EffectLayer.Waist );
Say( true, "Beware, mortals! You have provoked my wrath!" );
FixedParticles( 0x376A, 10, 10, 9537, 33, 0, EffectLayer.Waist );
Timer.DelayCall( TimeSpan.FromSeconds( 5.0 ), new TimerCallback( DoAreaLeech_Finish ) );
}
@ -90,15 +90,15 @@ namespace Server.Mobiles
{
ArrayList list = new ArrayList();
foreach ( Mobile m in this.GetMobilesInRange( 6 ) )
foreach ( Mobile m in GetMobilesInRange( 6 ) )
{
if ( this.CanBeHarmful( m ) && this.IsEnemy( m ) )
if ( CanBeHarmful( m ) && IsEnemy( m ) )
list.Add( m );
}
if ( list.Count == 0 )
{
this.Say( true, "Bah! You have escaped my grasp this time, mortal!" );
Say( true, "Bah! You have escaped my grasp this time, mortal!" );
}
else
{
@ -125,17 +125,17 @@ namespace Server.Mobiles
m.MovingParticles( this, 0x36F4, 1, 0, false, false, 32, 0, 9535, 1, 0, (EffectLayer)255, 0x100 );
m.MovingParticles( this, 0x0001, 1, 0, false, true, 32, 0, 9535, 9536, 0, (EffectLayer)255, 0 );
this.DoHarmful( m );
this.Hits += AOS.Damage( m, this, damage, 100, 0, 0, 0, 0 );
DoHarmful( m );
Hits += AOS.Damage( m, this, damage, 100, 0, 0, 0, 0 );
}
this.Say( true, "If I cannot cleanse thy soul, I will destroy it!" );
Say( true, "If I cannot cleanse thy soul, I will destroy it!" );
}
}
private void DoFocusedLeech( Mobile combatant, string message )
{
this.Say( true, message );
Say( true, message );
Timer.DelayCall( TimeSpan.FromSeconds( 0.5 ), new TimerStateCallback( DoFocusedLeech_Stage1 ), combatant );
}
@ -144,11 +144,11 @@ namespace Server.Mobiles
{
Mobile combatant = (Mobile)state;
if ( this.CanBeHarmful( combatant ) )
if ( CanBeHarmful( combatant ) )
{
this.MovingParticles( combatant, 0x36FA, 1, 0, false, false, 1108, 0, 9533, 1, 0, (EffectLayer)255, 0x100 );
this.MovingParticles( combatant, 0x0001, 1, 0, false, true, 1108, 0, 9533, 9534, 0, (EffectLayer)255, 0 );
this.PlaySound( 0x1FB );
MovingParticles( combatant, 0x36FA, 1, 0, false, false, 1108, 0, 9533, 1, 0, (EffectLayer)255, 0x100 );
MovingParticles( combatant, 0x0001, 1, 0, false, true, 1108, 0, 9533, 9534, 0, (EffectLayer)255, 0 );
PlaySound( 0x1FB );
Timer.DelayCall( TimeSpan.FromSeconds( 1.0 ), new TimerStateCallback( DoFocusedLeech_Stage2 ), combatant );
}
@ -158,14 +158,14 @@ namespace Server.Mobiles
{
Mobile combatant = (Mobile)state;
if ( this.CanBeHarmful( combatant ) )
if ( CanBeHarmful( combatant ) )
{
combatant.MovingParticles( this, 0x36F4, 1, 0, false, false, 32, 0, 9535, 1, 0, (EffectLayer)255, 0x100 );
combatant.MovingParticles( this, 0x0001, 1, 0, false, true, 32, 0, 9535, 9536, 0, (EffectLayer)255, 0 );
this.PlaySound( 0x209 );
this.DoHarmful( combatant );
this.Hits += AOS.Damage( combatant, this, Utility.RandomMinMax( 30, 40 ) - (Core.AOS ? 0 : 10), 100, 0, 0, 0, 0 );
PlaySound( 0x209 );
DoHarmful( combatant );
Hits += AOS.Damage( combatant, this, Utility.RandomMinMax( 30, 40 ) - (Core.AOS ? 0 : 10), 100, 0, 0, 0, 0 );
}
}
@ -173,9 +173,9 @@ namespace Server.Mobiles
{
if ( DateTime.UtcNow >= m_NextAbilityTime )
{
Mobile combatant = this.Combatant;
Mobile combatant = Combatant;
if ( combatant != null && combatant.Map == this.Map && combatant.InRange( this, 12 ) )
if ( combatant != null && combatant.Map == Map && combatant.InRange( this, 12 ) )
{
m_NextAbilityTime = DateTime.UtcNow + TimeSpan.FromSeconds( Utility.RandomMinMax( 10, 15 ) );

10
Scripts/Mobiles/Monsters/LBR/Meers/MeerMage.cs
View file

@ -80,9 +80,9 @@ namespace Server.Mobiles
{
if ( DateTime.UtcNow >= m_NextAbilityTime )
{
Mobile combatant = this.Combatant;
Mobile combatant = Combatant;
if ( combatant != null && combatant.Map == this.Map && combatant.InRange( this, 12 ) && IsEnemy( combatant ) && !UnderEffect( combatant ) )
if ( combatant != null && combatant.Map == Map && combatant.InRange( this, 12 ) && IsEnemy( combatant ) && !UnderEffect( combatant ) )
{
m_NextAbilityTime = DateTime.UtcNow + TimeSpan.FromSeconds( Utility.RandomMinMax( 20, 30 ) );
@ -90,7 +90,7 @@ namespace Server.Mobiles
{
if ( bc.Controlled && bc.ControlMaster != null && !bc.ControlMaster.Deleted && bc.ControlMaster.Alive )
{
if ( bc.ControlMaster.Map == this.Map && bc.ControlMaster.InRange( this, 12 ) && !UnderEffect( bc.ControlMaster ) )
if ( bc.ControlMaster.Map == Map && bc.ControlMaster.InRange( this, 12 ) && !UnderEffect( bc.ControlMaster ) )
{
Combatant = combatant = bc.ControlMaster;
}
@ -127,11 +127,11 @@ namespace Server.Mobiles
rabid.FocusMob = combatant;
rabid.MoveToWorld( loc, combatant.Map );
}
this.Say( 1071932 ); //Creatures of the forest, I call to thee! Aid me in the fight against all that is evil!
Say( 1071932 ); //Creatures of the forest, I call to thee! Aid me in the fight against all that is evil!
}
else if ( combatant.Player )
{
this.Say( true, "I call a plague of insects to sting your flesh!" );
Say( true, "I call a plague of insects to sting your flesh!" );
m_Table[combatant] = Timer.DelayCall( TimeSpan.FromSeconds( 0.5 ), TimeSpan.FromSeconds( 7.0 ), new TimerStateCallback( DoEffect ), new object[]{ combatant, 0 } );
}
}

2
Scripts/Mobiles/Monsters/LBR/Meers/MeerWarrior.cs
View file

@ -53,7 +53,7 @@ namespace Server.Mobiles
{
if ( from != null && !willKill && amount > 3 && from != null && !InRange( from, 7 ) )
{
this.MovingEffect( from, 0xF51, 10, 0, false, false );
MovingEffect( from, 0xF51, 10, 0, false, false );
SpellHelper.Damage( TimeSpan.FromSeconds( 1.0 ), from, this, Utility.RandomMinMax( 30, 40 ) - (Core.AOS ? 0 : 10), 100, 0, 0, 0, 0 );
}