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

8
Scripts/Spells/Base/SpecialMove.cs
View file

@ -87,7 +87,7 @@ namespace Server.Spells
{
double scalar = 1.0;
if ( !Server.Spells.Necromancy.MindRotSpell.GetMindRotScalar( m, ref scalar ) )
if ( !Necromancy.MindRotSpell.GetMindRotScalar( m, ref scalar ) )
scalar = 1.0;
// Lower Mana Cost = 40%
@ -133,7 +133,7 @@ namespace Server.Spells
Timer timer = new SpecialMoveTimer( from );
timer.Start();
AddContext( from, new SpecialMoveContext( timer, this.GetType() ) );
AddContext( from, new SpecialMoveContext( timer, GetType() ) );
}
}
}
@ -143,13 +143,13 @@ namespace Server.Spells
if ( !from.Player )
return true;
if ( Bushido.HonorableExecution.IsUnderPenalty( from ) )
if ( HonorableExecution.IsUnderPenalty( from ) )
{
from.SendLocalizedMessage( 1063024 ); // You cannot perform this special move right now.
return false;
}
if ( Ninjitsu.AnimalForm.UnderTransformation( from ) )
if ( AnimalForm.UnderTransformation( from ) )
{
from.SendLocalizedMessage( 1063024 ); // You cannot perform this special move right now.
return false;

6
Scripts/Spells/Base/Spell.cs
View file

@ -438,7 +438,7 @@ namespace Server.Spells
OnDisturb( type, false );
Targeting.Target.Cancel( m_Caster );
Target.Cancel( m_Caster );
if ( Core.AOS && m_Caster.Player && type == DisturbType.Hurt )
DoHurtFizzle();
@ -529,7 +529,7 @@ namespace Server.Spells
SayMantra();
TimeSpan castDelay = this.GetCastDelay();
TimeSpan castDelay = GetCastDelay();
if ( ShowHandMovement && ( m_Caster.Body.IsHuman || ( m_Caster.Player && m_Caster.Body.IsMonster ) ) )
{
@ -612,7 +612,7 @@ namespace Server.Spells
{
double scalar = 1.0;
if ( !Necromancy.MindRotSpell.GetMindRotScalar( Caster, ref scalar ) )
if ( !MindRotSpell.GetMindRotScalar( Caster, ref scalar ) )
scalar = 1.0;
// Lower Mana Cost = 40%

6
Scripts/Spells/Base/SpellHelper.cs
View file

@ -475,7 +475,7 @@ namespace Server.Spells
Point3D p = new Point3D( caster );
if ( SpellHelper.FindValidSpawnLocation( map, ref p, true ) )
if ( FindValidSpawnLocation( map, ref p, true ) )
{
BaseCreature.Summon( creature, caster, p, sound, duration );
return;
@ -631,7 +631,7 @@ namespace Server.Spells
return false;
}
if ( caster != null && caster.AccessLevel == AccessLevel.Player && caster.Region.IsPartOf( typeof( Regions.Jail ) ) )
if ( caster != null && caster.AccessLevel == AccessLevel.Player && caster.Region.IsPartOf( typeof( Jail ) ) )
{
caster.SendLocalizedMessage( 1114345 ); // You'll need a better jailbreak plan than that!
return false;
@ -1351,7 +1351,7 @@ namespace Server.Spells
if ( !((Body)transformSpell.Body).IsHuman )
{
Mobiles.IMount mt = caster.Mount;
IMount mt = caster.Mount;
if ( mt != null )
mt.Rider = null;

2
Scripts/Spells/Chivalry/CloseWounds.cs
View file

@ -58,7 +58,7 @@ namespace Server.Spells.Chivalry
{
Caster.SendLocalizedMessage( 500955 ); // That being is not damaged!
}
else if ( m.Poisoned || Server.Items.MortalStrike.IsWounded( m ) )
else if ( m.Poisoned || Items.MortalStrike.IsWounded( m ) )
{
Caster.LocalOverheadMessage( MessageType.Regular, 0x3B2, (Caster == m) ? 1005000 : 1010398 );
}

2
Scripts/Spells/Chivalry/PaladinSpell.cs
View file

@ -46,7 +46,7 @@ namespace Server.Spells.Chivalry
public override bool CheckFizzle()
{
int requiredTithing = this.RequiredTithing;
int requiredTithing = RequiredTithing;
if ( AosAttributes.GetValue( Caster, AosAttribute.LowerRegCost ) > Utility.Random( 100 ) )
requiredTithing = 0;

4
Scripts/Spells/Chivalry/SacredJourney.cs
View file

@ -64,7 +64,7 @@ namespace Server.Spells.Chivalry
Caster.SendLocalizedMessage( 1061282 ); // You cannot use the Sacred Journey ability to flee from combat.
return false;
}
else if ( Server.Misc.WeightOverloading.IsOverloaded( Caster ) )
else if ( Misc.WeightOverloading.IsOverloaded( Caster ) )
{
Caster.SendLocalizedMessage( 502359, "", 0x22 ); // Thou art too encumbered to move.
return false;
@ -105,7 +105,7 @@ namespace Server.Spells.Chivalry
{
Caster.SendLocalizedMessage( 1061282 ); // You cannot use the Sacred Journey ability to flee from combat.
}
else if ( Server.Misc.WeightOverloading.IsOverloaded( Caster ) )
else if ( Misc.WeightOverloading.IsOverloaded( Caster ) )
{
Caster.SendLocalizedMessage( 502359, "", 0x22 ); // Thou art too encumbered to move.
}

4
Scripts/Spells/Fifth/MindBlast.cs
View file

@ -61,7 +61,7 @@ namespace Server.Spells.Fifth
SpellHelper.Turn( from, target );
SpellHelper.CheckReflect( (int)this.Circle, ref from, ref target );
SpellHelper.CheckReflect( (int)Circle, ref from, ref target );
int damage = (int)((Caster.Skills[SkillName.Magery].Value + Caster.Int) / 5);
@ -79,7 +79,7 @@ namespace Server.Spells.Fifth
SpellHelper.Turn( from, target );
SpellHelper.CheckReflect( (int)this.Circle, ref from, ref target );
SpellHelper.CheckReflect( (int)Circle, ref from, ref target );
// Algorithm: (highestStat - lowestStat) / 2 [- 50% if resisted]

2
Scripts/Spells/Fifth/Paralyze.cs
View file

@ -41,7 +41,7 @@ namespace Server.Spells.Fifth
{
SpellHelper.Turn( Caster, m );
SpellHelper.CheckReflect( (int)this.Circle, Caster, ref m );
SpellHelper.CheckReflect( (int)Circle, Caster, ref m );
double duration;

2
Scripts/Spells/First/Clumsy.cs
View file

@ -34,7 +34,7 @@ namespace Server.Spells.First
{
SpellHelper.Turn( Caster, m );
SpellHelper.CheckReflect( (int)this.Circle, Caster, ref m );
SpellHelper.CheckReflect( (int)Circle, Caster, ref m );
SpellHelper.AddStatCurse( Caster, m, StatType.Dex );

2
Scripts/Spells/First/Feeblemind.cs
View file

@ -34,7 +34,7 @@ namespace Server.Spells.First
{
SpellHelper.Turn( Caster, m );
SpellHelper.CheckReflect( (int)this.Circle, Caster, ref m );
SpellHelper.CheckReflect( (int)Circle, Caster, ref m );
SpellHelper.AddStatCurse( Caster, m, StatType.Int );

2
Scripts/Spells/First/Heal.cs
View file

@ -55,7 +55,7 @@ namespace Server.Spells.First
{
Caster.LocalOverheadMessage( MessageType.Regular, 0x3B2, 500951 ); // You cannot heal that.
}
else if ( m.Poisoned || Server.Items.MortalStrike.IsWounded( m ) )
else if ( m.Poisoned || Items.MortalStrike.IsWounded( m ) )
{
Caster.LocalOverheadMessage( MessageType.Regular, 0x22, (Caster == m) ? 1005000 : 1010398 );
}

2
Scripts/Spells/First/MagicArrow.cs
View file

@ -38,7 +38,7 @@ namespace Server.Spells.First
SpellHelper.Turn( source, m );
SpellHelper.CheckReflect( (int)this.Circle, ref source, ref m );
SpellHelper.CheckReflect( (int)Circle, ref source, ref m );
double damage;

2
Scripts/Spells/First/Weaken.cs
View file

@ -34,7 +34,7 @@ namespace Server.Spells.First
{
SpellHelper.Turn( Caster, m );
SpellHelper.CheckReflect( (int)this.Circle, Caster, ref m );
SpellHelper.CheckReflect( (int)Circle, Caster, ref m );
SpellHelper.AddStatCurse( Caster, m, StatType.Str );

4
Scripts/Spells/Fourth/ArchProtection.cs
View file

@ -68,7 +68,7 @@ namespace Server.Spells.Fourth
if ( m == Caster || ( party != null && party.Contains( m ) ) )
{
Caster.DoBeneficial( m );
Spells.Second.ProtectionSpell.Toggle( Caster, m );
Second.ProtectionSpell.Toggle( Caster, m );
}
}
}
@ -139,7 +139,7 @@ namespace Server.Spells.Fourth
protected override void OnTick()
{
ArchProtectionSpell.RemoveEntry( m_Owner );
RemoveEntry( m_Owner );
}
}

2
Scripts/Spells/Fourth/Curse.cs
View file

@ -52,7 +52,7 @@ namespace Server.Spells.Fourth
{
SpellHelper.Turn( Caster, m );
SpellHelper.CheckReflect( (int)this.Circle, Caster, ref m );
SpellHelper.CheckReflect( (int)Circle, Caster, ref m );
SpellHelper.AddStatCurse( Caster, m, StatType.Str ); SpellHelper.DisableSkillCheck = true;
SpellHelper.AddStatCurse( Caster, m, StatType.Dex );

2
Scripts/Spells/Fourth/GreaterHeal.cs
View file

@ -56,7 +56,7 @@ namespace Server.Spells.Fourth
{
Caster.LocalOverheadMessage( MessageType.Regular, 0x3B2, 500951 ); // You cannot heal that.
}
else if ( m.Poisoned || Server.Items.MortalStrike.IsWounded( m ) )
else if ( m.Poisoned || Items.MortalStrike.IsWounded( m ) )
{
Caster.LocalOverheadMessage( MessageType.Regular, 0x22, (Caster == m) ? 1005000 : 1010398 );
}

2
Scripts/Spells/Fourth/Lightning.cs
View file

@ -35,7 +35,7 @@ namespace Server.Spells.Fourth
{
SpellHelper.Turn( Caster, m );
SpellHelper.CheckReflect( (int)this.Circle, Caster, ref m );
SpellHelper.CheckReflect( (int)Circle, Caster, ref m );
double damage;

2
Scripts/Spells/Fourth/ManaDrain.cs
View file

@ -56,7 +56,7 @@ namespace Server.Spells.Fourth
{
SpellHelper.Turn( Caster, m );
SpellHelper.CheckReflect( (int)this.Circle, Caster, ref m );
SpellHelper.CheckReflect( (int)Circle, Caster, ref m );
if ( m.Spell != null )
m.Spell.OnCasterHurt();

4
Scripts/Spells/Fourth/Recall.cs
View file

@ -68,7 +68,7 @@ namespace Server.Spells.Fourth
Caster.SendLocalizedMessage( 1005564, "", 0x22 ); // Wouldst thou flee during the heat of battle??
return false;
}
else if ( Server.Misc.WeightOverloading.IsOverloaded( Caster ) )
else if ( Misc.WeightOverloading.IsOverloaded( Caster ) )
{
Caster.SendLocalizedMessage( 502359, "", 0x22 ); // Thou art too encumbered to move.
return false;
@ -109,7 +109,7 @@ namespace Server.Spells.Fourth
{
Caster.SendLocalizedMessage( 1005564, "", 0x22 ); // Wouldst thou flee during the heat of battle??
}
else if ( Server.Misc.WeightOverloading.IsOverloaded( Caster ) )
else if ( Misc.WeightOverloading.IsOverloaded( Caster ) )
{
Caster.SendLocalizedMessage( 502359, "", 0x22 ); // Thou art too encumbered to move.
}

22
Scripts/Spells/Gargoyle/SpellDefinitions/FlySpell.cs
View file

@ -41,8 +41,8 @@ namespace Server.Spells
public void Stop()
{
this.m_Stop = true;
this.Disturb(DisturbType.Hurt, false, false);
m_Stop = true;
Disturb(DisturbType.Hurt, false, false);
}
public override bool CheckDisturb(DisturbType type, bool checkFirst, bool resistable)
@ -63,19 +63,19 @@ namespace Server.Spells
public override void OnDisturb(DisturbType type, bool message)
{
if (message && !this.m_Stop)
this.Caster.SendLocalizedMessage(1113192); // You have been disrupted while attempting to fly!
if (message && !m_Stop)
Caster.SendLocalizedMessage(1113192); // You have been disrupted while attempting to fly!
}
public override void OnCast()
{
this.Caster.Flying = false;
BuffInfo.RemoveBuff(this.Caster, BuffIcon.Fly);
this.Caster.Animate(60, 10, 1, true, false, 0);
this.Caster.SendLocalizedMessage(1112567); // You are flying.
this.Caster.Flying = true;
BuffInfo.AddBuff(this.Caster, new BuffInfo(BuffIcon.Fly, 1112567));
this.FinishSequence();
Caster.Flying = false;
BuffInfo.RemoveBuff(Caster, BuffIcon.Fly);
Caster.Animate(60, 10, 1, true, false, 0);
Caster.SendLocalizedMessage(1112567); // You are flying.
Caster.Flying = true;
BuffInfo.AddBuff(Caster, new BuffInfo(BuffIcon.Fly, 1112567));
FinishSequence();
}
}
}

8
Scripts/Spells/Ninjitsu/AnimalForm.cs
View file

@ -18,7 +18,7 @@ namespace Server.Spells.Ninjitsu
public static void OnLogin(LoginEventArgs e)
{
AnimalFormContext context = AnimalForm.GetContext(e.Mobile);
AnimalFormContext context = GetContext(e.Mobile);
if (context != null && context.SpeedBoost)
e.Mobile.Send(SpeedControl.MountSpeed);
@ -483,7 +483,7 @@ namespace Server.Spells.Ninjitsu
{
}
#endregion
else if (AnimalForm.Morph(m_Caster, entryID) == MorphResult.Fail)
else if (Morph(m_Caster, entryID) == MorphResult.Fail)
{
m_Caster.LocalOverheadMessage( MessageType.Regular, 0x3B2, 502632 ); // The spell fizzles.
m_Caster.FixedParticles( 0x3735, 1, 30, 9503, EffectLayer.Waist );
@ -585,7 +585,7 @@ namespace Server.Spells.Ninjitsu
m_Mobile.Freeze(TimeSpan.FromSeconds(1));
m_Mobile.PlaySound(0x16A);
Timer.DelayCall<Mobile>(TimeSpan.FromSeconds(1.3), new TimerStateCallback<Mobile>(BreathEffect_Callback), m_LastTarget);
DelayCall<Mobile>(TimeSpan.FromSeconds(1.3), new TimerStateCallback<Mobile>(BreathEffect_Callback), m_LastTarget);
}
m_Counter = Math.Min((int)m_Mobile.GetDistanceToSqrt(m_LastTarget), 10);
@ -602,7 +602,7 @@ namespace Server.Spells.Ninjitsu
m_Mobile.PlaySound(0x227);
Effects.SendMovingEffect(m_Mobile, target, 0x36D4, 5, 0, false, false, 0, 0);
Timer.DelayCall<Mobile>(TimeSpan.FromSeconds(1), new TimerStateCallback<Mobile>(BreathDamage_Callback), target);
DelayCall<Mobile>(TimeSpan.FromSeconds(1), new TimerStateCallback<Mobile>(BreathDamage_Callback), target);
}
}

4
Scripts/Spells/Ninjitsu/ShadowJump.cs
View file

@ -68,7 +68,7 @@ namespace Server.Spells.Ninjitsu
{
Caster.SendLocalizedMessage( 1061632 ); // You can't do that while carrying the sigil.
}
else if ( Server.Misc.WeightOverloading.IsOverloaded( Caster ) )
else if ( Misc.WeightOverloading.IsOverloaded( Caster ) )
{
Caster.SendLocalizedMessage( 502359, "", 0x22 ); // Thou art too encumbered to move.
}
@ -100,7 +100,7 @@ namespace Server.Spells.Ninjitsu
m.PlaySound( 0x512 );
Server.SkillHandlers.Stealth.OnUse( m ); // stealth check after the a jump
SkillHandlers.Stealth.OnUse( m ); // stealth check after the a jump
}
FinishSequence();

2
Scripts/Spells/Second/Harm.cs
View file

@ -42,7 +42,7 @@ namespace Server.Spells.Second
{
SpellHelper.Turn( Caster, m );
SpellHelper.CheckReflect( (int)this.Circle, Caster, ref m );
SpellHelper.CheckReflect( (int)Circle, Caster, ref m );
double damage;

2
Scripts/Spells/Second/Protection.cs
View file

@ -176,7 +176,7 @@ namespace Server.Spells.Second
protected override void OnTick()
{
ProtectionSpell.Registry.Remove( m_Caster );
Registry.Remove( m_Caster );
DefensiveSpell.Nullify( m_Caster );
}
}

2
Scripts/Spells/Seventh/FlameStrike.cs
View file

@ -35,7 +35,7 @@ namespace Server.Spells.Seventh
{
SpellHelper.Turn( Caster, m );
SpellHelper.CheckReflect( (int)this.Circle, Caster, ref m );
SpellHelper.CheckReflect( (int)Circle, Caster, ref m );
double damage;

2
Scripts/Spells/Seventh/ManaVampire.cs
View file

@ -35,7 +35,7 @@ namespace Server.Spells.Seventh
{
SpellHelper.Turn( Caster, m );
SpellHelper.CheckReflect( (int)this.Circle, Caster, ref m );
SpellHelper.CheckReflect( (int)Circle, Caster, ref m );
if ( m.Spell != null )
m.Spell.OnCasterHurt();

2
Scripts/Spells/Sixth/EnergyBolt.cs
View file

@ -37,7 +37,7 @@ namespace Server.Spells.Sixth
SpellHelper.Turn( Caster, m );
SpellHelper.CheckReflect( (int)this.Circle, ref source, ref m );
SpellHelper.CheckReflect( (int)Circle, ref source, ref m );
double damage;

2
Scripts/Spells/Sixth/Explosion.cs
View file

@ -41,7 +41,7 @@ namespace Server.Spells.Sixth
SpellHelper.Turn( Caster, m );
SpellHelper.CheckReflect( (int) this.Circle, Caster, ref m );
SpellHelper.CheckReflect( (int) Circle, Caster, ref m );
InternalTimer t = new InternalTimer( this, attacker, defender, m );
t.Start();

2
Scripts/Spells/Spellweaving/AttuneWeapon.cs
View file

@ -124,7 +124,7 @@ namespace Server.Spells.Spellweaving
m_Table.Remove( m_Mobile );
Timer.DelayCall( TimeSpan.FromSeconds( 120 ), delegate { m_Mobile.EndAction( typeof( AttuneWeaponSpell ) ); } );
DelayCall( TimeSpan.FromSeconds( 120 ), delegate { m_Mobile.EndAction( typeof( AttuneWeaponSpell ) ); } );
BuffInfo.RemoveBuff( m_Mobile, BuffIcon.AttuneWeapon );
}
}

8
Scripts/Spells/Spellweaving/Items/TransientItem.cs
View file

@ -30,7 +30,7 @@ namespace Server.Items
if ( InvalidTransferMessage != null )
TextDefinition.SendMessageTo( from, InvalidTransferMessage );
this.Delete();
Delete();
}
public virtual TextDefinition InvalidTransferMessage => null;
@ -39,16 +39,16 @@ namespace Server.Items
public virtual void Expire( Mobile parent )
{
if ( parent != null )
parent.SendLocalizedMessage( 1072515, (this.Name == null ? String.Format( "#{0}", LabelNumber ): this.Name) ); // The ~1_name~ expired...
parent.SendLocalizedMessage( 1072515, (Name == null ? String.Format( "#{0}", LabelNumber ): Name) ); // The ~1_name~ expired...
Effects.PlaySound( GetWorldLocation(), Map, 0x201 );
this.Delete();
Delete();
}
public virtual void SendTimeRemainingMessage( Mobile to )
{
to.SendLocalizedMessage( 1072516, String.Format( "{0}\t{1}", (this.Name == null ? String.Format( "#{0}", LabelNumber ): this.Name), (int)m_LifeSpan.TotalSeconds ) ); // ~1_name~ will expire in ~2_val~ seconds!
to.SendLocalizedMessage( 1072516, String.Format( "{0}\t{1}", (Name == null ? String.Format( "#{0}", LabelNumber ): Name), (int)m_LifeSpan.TotalSeconds ) ); // ~1_name~ will expire in ~2_val~ seconds!
}
public override void OnDelete()

2
Scripts/Spells/Third/Fireball.cs
View file

@ -36,7 +36,7 @@ namespace Server.Spells.Third
SpellHelper.Turn( source, m );
SpellHelper.CheckReflect( (int)this.Circle, ref source, ref m );
SpellHelper.CheckReflect( (int)Circle, ref source, ref m );
double damage;

2
Scripts/Spells/Third/Poison.cs
View file

@ -32,7 +32,7 @@ namespace Server.Spells.Third
{
SpellHelper.Turn( Caster, m );
SpellHelper.CheckReflect( (int)this.Circle, Caster, ref m );
SpellHelper.CheckReflect( (int)Circle, Caster, ref m );
if ( m.Spell != null )
m.Spell.OnCasterHurt();

6
Scripts/Spells/Third/Teleport.cs
View file

@ -27,7 +27,7 @@ namespace Server.Spells.Third
Caster.SendLocalizedMessage( 1061632 ); // You can't do that while carrying the sigil.
return false;
}
else if ( Server.Misc.WeightOverloading.IsOverloaded( Caster ) )
else if ( Misc.WeightOverloading.IsOverloaded( Caster ) )
{
Caster.SendLocalizedMessage( 502359, "", 0x22 ); // Thou art too encumbered to move.
return false;
@ -55,7 +55,7 @@ namespace Server.Spells.Third
{
Caster.SendLocalizedMessage( 1061632 ); // You can't do that while carrying the sigil.
}
else if ( Server.Misc.WeightOverloading.IsOverloaded( Caster ) )
else if ( Misc.WeightOverloading.IsOverloaded( Caster ) )
{
Caster.SendLocalizedMessage( 502359, "", 0x22 ); // Thou art too encumbered to move.
}
@ -102,7 +102,7 @@ namespace Server.Spells.Third
foreach ( Item item in eable )
{
if ( item is Server.Spells.Sixth.ParalyzeFieldSpell.InternalItem || item is Server.Spells.Fifth.PoisonFieldSpell.InternalItem || item is Server.Spells.Fourth.FireFieldSpell.FireFieldItem )
if ( item is Sixth.ParalyzeFieldSpell.InternalItem || item is Fifth.PoisonFieldSpell.InternalItem || item is Fourth.FireFieldSpell.FireFieldItem )
item.OnMoveOver( m );
}