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

4
Scripts/Items/Weapons/Abilities/Dismount.cs
View file

@ -48,7 +48,7 @@ namespace Server.Items
IMount mount = defender.Mount;
if (mount == null && !Server.Spells.Ninjitsu.AnimalForm.UnderTransformation( defender ) )
if (mount == null && !Spells.Ninjitsu.AnimalForm.UnderTransformation( defender ) )
{
attacker.SendLocalizedMessage( 1060848 ); // This attack only works on mounted targets
return;
@ -74,7 +74,7 @@ namespace Server.Items
if (defender is PlayerMobile mobile)
{
if (Server.Spells.Ninjitsu.AnimalForm.UnderTransformation(mobile))
if (Spells.Ninjitsu.AnimalForm.UnderTransformation(mobile))
{
mobile.SendLocalizedMessage(1114066, attacker.Name); // ~1_NAME~ knocked you out of animal form!
}

4
Scripts/Items/Weapons/Abilities/FrenziedWhirlwind.cs
View file

@ -133,7 +133,7 @@ namespace Server.Items
if ( !m_Defender.Alive || m_DamageRemaining <= 0 )
{
Stop();
Server.Items.FrenziedWhirlwind.Registry.Remove( m_Defender );
Registry.Remove( m_Defender );
return;
}
@ -154,7 +154,7 @@ namespace Server.Items
if ( !m_Defender.Alive || m_DamageRemaining <= 0 )
{
Stop();
Server.Items.FrenziedWhirlwind.Registry.Remove( m_Defender );
Registry.Remove( m_Defender );
}
}
}

4
Scripts/Items/Weapons/Abilities/TalonStrike.cs
View file

@ -75,7 +75,7 @@ namespace Server.Items
if ( !m_Defender.Alive || m_DamageRemaining <= 0 )
{
Stop();
Server.Items.TalonStrike.Registry.Remove( m_Defender );
Registry.Remove( m_Defender );
return;
}
@ -97,7 +97,7 @@ namespace Server.Items
if ( !m_Defender.Alive || m_DamageRemaining <= 0 )
{
Stop();
Server.Items.TalonStrike.Registry.Remove( m_Defender );
Registry.Remove( m_Defender );
}
}
}

2
Scripts/Items/Weapons/Abilities/WeaponAbility.cs
View file

@ -66,7 +66,7 @@ namespace Server.Items
mana -= 5;
double scalar = 1.0;
if ( !Server.Spells.Necromancy.MindRotSpell.GetMindRotScalar( from, ref scalar ) )
if ( !Spells.Necromancy.MindRotSpell.GetMindRotScalar( from, ref scalar ) )
scalar = 1.0;
// Lower Mana Cost = 40%

8
Scripts/Items/Weapons/Axes/BaseAxe.cs
View file

@ -85,16 +85,16 @@ namespace Server.Items
if ( !from.InLOS( loc ) || !from.InRange( loc, 2 ) )
{
from.LocalOverheadMessage( Server.Network.MessageType.Regular, 0x3E9, 1019045 ); // I can't reach that
from.LocalOverheadMessage( MessageType.Regular, 0x3E9, 1019045 ); // I can't reach that
return;
}
else if ( !this.IsAccessibleTo( from ) )
else if ( !IsAccessibleTo( from ) )
{
this.PublicOverheadMessage( MessageType.Regular, 0x3E9, 1061637 ); // You are not allowed to access this.
PublicOverheadMessage( MessageType.Regular, 0x3E9, 1061637 ); // You are not allowed to access this.
return;
}
if ( !(this.HarvestSystem is Mining) )
if ( !(HarvestSystem is Mining) )
from.SendLocalizedMessage( 1010018 ); // What do you want to use this item on?
HarvestSystem.BeginHarvesting( from, this );

20
Scripts/Items/Weapons/BaseWeapon.cs
View file

@ -535,12 +535,12 @@ namespace Server.Items
if ( base.CheckConflictingLayer( m, item, layer ) )
return true;
if ( this.Layer == Layer.TwoHanded && layer == Layer.OneHanded )
if ( Layer == Layer.TwoHanded && layer == Layer.OneHanded )
{
m.SendLocalizedMessage( 500214 ); // You already have something in both hands.
return true;
}
else if ( this.Layer == Layer.OneHanded && layer == Layer.TwoHanded && !(item is BaseShield) && !(item is BaseEquipableLight) )
else if ( Layer == Layer.OneHanded && layer == Layer.TwoHanded && !(item is BaseShield) && !(item is BaseEquipableLight) )
{
m.SendLocalizedMessage( 500215 ); // You can only wield one weapon at a time.
return true;
@ -608,7 +608,7 @@ namespace Server.Items
{
Mobile m = from;
string modName = this.Serial.ToString();
string modName = Serial.ToString();
if ( strBonus != 0 )
m.AddStatMod( new StatMod( StatType.Str, modName + "Str", strBonus, TimeSpan.Zero ) );
@ -661,7 +661,7 @@ namespace Server.Items
{
BaseWeapon weapon = m.Weapon as BaseWeapon;
string modName = this.Serial.ToString();
string modName = Serial.ToString();
m.RemoveStatMod( modName + "Str" );
m.RemoveStatMod( modName + "Dex" );
@ -849,7 +849,7 @@ namespace Server.Items
public virtual TimeSpan GetDelay( Mobile m )
{
double speed = this.Speed;
double speed = Speed;
if ( speed == 0 )
return TimeSpan.FromHours( 1.0 );
@ -1798,7 +1798,7 @@ namespace Server.Items
attacker.DoHarmful( defender );
Spells.MagerySpell sp = new Spells.Sixth.DispelSpell( attacker, null );
MagerySpell sp = new Spells.Sixth.DispelSpell( attacker, null );
if ( sp.CheckResisted( defender ) )
{
@ -2168,7 +2168,7 @@ namespace Server.Items
int defenseMasteryMalus = 0;
// Defense Mastery gives a -50%/-80% malus to damage.
if ( Server.Items.DefenseMastery.GetMalus( attacker, ref defenseMasteryMalus ) )
if ( DefenseMastery.GetMalus( attacker, ref defenseMasteryMalus ) )
damageBonus -= defenseMasteryMalus;
int discordanceEffect = 0;
@ -2854,7 +2854,7 @@ namespace Server.Items
if ( parentMobile != null && (strBonus != 0 || dexBonus != 0 || intBonus != 0) )
{
string modName = this.Serial.ToString();
string modName = Serial.ToString();
if ( strBonus != 0 )
parentMobile.AddStatMod( new StatMod( StatType.Str, modName + "Str", strBonus, TimeSpan.Zero ) );
@ -2912,7 +2912,7 @@ namespace Server.Items
private string GetNameString()
{
string name = this.Name;
string name = Name;
if ( name == null )
name = String.Format( "#{0}", LabelNumber );
@ -3340,7 +3340,7 @@ namespace Server.Items
}
else
{
this.LabelTo( from, Name );
LabelTo( from, Name );
number = 1041000;
}

2
Scripts/Items/Weapons/ML Weapons/Artifacts/ColdForgedBlade.cs
View file

@ -13,7 +13,7 @@ namespace Server.Items
Attributes.WeaponSpeed = 25;
Attributes.WeaponDamage = 50;
Hue = this.GetElementalDamageHue();
Hue = GetElementalDamageHue();
}
public override void GetDamageTypes( Mobile wielder, out int phys, out int fire, out int cold, out int pois, out int nrgy, out int chaos, out int direct )

2
Scripts/Items/Weapons/ML Weapons/Artifacts/LuminousRuneBlade.cs
View file

@ -13,7 +13,7 @@ namespace Server.Items
Attributes.WeaponSpeed = 25;
Attributes.WeaponDamage = 55;
Hue = this.GetElementalDamageHue();
Hue = GetElementalDamageHue();
}
public override void GetDamageTypes( Mobile wielder, out int phys, out int fire, out int cold, out int pois, out int nrgy, out int chaos, out int direct )

2
Scripts/Items/Weapons/ML Weapons/Artifacts/OverseerSunderedBlade.cs
View file

@ -15,7 +15,7 @@ namespace Server.Items
Attributes.WeaponSpeed = 35;
Attributes.WeaponDamage = 45;
Hue = this.GetElementalDamageHue();
Hue = GetElementalDamageHue();
}
public override void GetDamageTypes( Mobile wielder, out int phys, out int fire, out int cold, out int pois, out int nrgy, out int chaos, out int direct )