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/Skill Items/Magical/Misc/Moongate.cs
View file

@ -161,10 +161,10 @@ namespace Server.Items
public virtual bool ValidateUse( Mobile from, bool message )
{
if ( from.Deleted || this.Deleted )
if ( from.Deleted || Deleted )
return false;
if ( from.Map != this.Map || !from.InRange( this, 1 ) )
if ( from.Map != Map || !from.InRange( this, 1 ) )
{
if ( message )
from.SendLocalizedMessage( 500446 ); // That is too far away.

4
Scripts/Items/Skill Items/Magical/Misc/PotionKeg.cs
View file

@ -43,7 +43,7 @@ namespace Server.Items
{
int held = Math.Max( 0, Math.Min( m_Held, 100 ) );
this.Weight = 20 + ((held * 80) / 100);
Weight = 20 + ((held * 80) / 100);
}
public PotionKeg( Serial serial ) : base( serial )
@ -160,7 +160,7 @@ namespace Server.Items
else
number = 502258; // The keg is completely full.
this.LabelTo( from, number );
LabelTo( from, number );
}
public override void OnDoubleClick( Mobile from )

4
Scripts/Items/Skill Items/Magical/Potions/Agility Potions/BaseAgilityPotion.cs
View file

@ -47,10 +47,10 @@ namespace Server.Items
{
if ( DoAgility( from ) )
{
BasePotion.PlayDrinkEffect( from );
PlayDrinkEffect( from );
if ( !Engines.ConPVP.DuelContext.IsFreeConsume( from ) )
this.Consume();
Consume();
}
}
}

6
Scripts/Items/Skill Items/Magical/Potions/BasePotion.cs
View file

@ -89,13 +89,13 @@ namespace Server.Items
if ( !Movable )
return;
if ( from.InRange( this.GetWorldLocation(), 1 ) )
if ( from.InRange( GetWorldLocation(), 1 ) )
{
if (!RequireFreeHand || HasFreeHand(from))
{
if (this is BaseExplosionPotion && Amount > 1)
{
BasePotion pot = (BasePotion)Activator.CreateInstance(this.GetType());
BasePotion pot = (BasePotion)Activator.CreateInstance(GetType());
if (pot != null)
{
@ -114,7 +114,7 @@ namespace Server.Items
}
else
{
this.Drink( from );
Drink( from );
}
}
else

4
Scripts/Items/Skill Items/Magical/Potions/Cure Potions/BaseCurePotion.cs
View file

@ -84,13 +84,13 @@ namespace Server.Items
{
DoCure( from );
BasePotion.PlayDrinkEffect( from );
PlayDrinkEffect( from );
from.FixedParticles( 0x373A, 10, 15, 5012, EffectLayer.Waist );
from.PlaySound( 0x1E0 );
if ( !Engines.ConPVP.DuelContext.IsFreeConsume( from ) )
this.Consume();
Consume();
}
else
{

6
Scripts/Items/Skill Items/Magical/Potions/Explosion Potions/BaseExplosionPotion.cs
View file

@ -42,12 +42,12 @@ namespace Server.Items
public virtual object FindParent( Mobile from )
{
Mobile m = this.HeldBy;
Mobile m = HeldBy;
if ( m != null && m.Holding == this )
return m;
object obj = this.RootParent;
object obj = RootParent;
if ( obj != null )
return obj;
@ -73,7 +73,7 @@ namespace Server.Items
}
ThrowTarget targ = from.Target as ThrowTarget;
this.Stackable = false; // Scavenged explosion potions won't stack with those ones in backpack, and still will explode.
Stackable = false; // Scavenged explosion potions won't stack with those ones in backpack, and still will explode.
if ( targ != null && targ.Potion == this )
return;

4
Scripts/Items/Skill Items/Magical/Potions/Heal Potions/BaseHealPotion.cs
View file

@ -53,10 +53,10 @@ namespace Server.Items
{
DoHeal( from );
BasePotion.PlayDrinkEffect( from );
PlayDrinkEffect( from );
if ( !Engines.ConPVP.DuelContext.IsFreeConsume( from ) )
this.Consume();
Consume();
Timer.DelayCall( TimeSpan.FromSeconds( Delay ), new TimerStateCallback( ReleaseHealLock ), from );
}

4
Scripts/Items/Skill Items/Magical/Potions/NightSight.cs
View file

@ -35,10 +35,10 @@ namespace Server.Items
from.FixedParticles( 0x376A, 9, 32, 5007, EffectLayer.Waist );
from.PlaySound( 0x1E3 );
BasePotion.PlayDrinkEffect( from );
PlayDrinkEffect( from );
if ( !Engines.ConPVP.DuelContext.IsFreeConsume( from ) )
this.Consume();
Consume();
}
else
{

4
Scripts/Items/Skill Items/Magical/Potions/Poison Potions/BasePoisonPotion.cs
View file

@ -38,10 +38,10 @@ namespace Server.Items
{
DoPoison( from );
BasePotion.PlayDrinkEffect( from );
PlayDrinkEffect( from );
if ( !Engines.ConPVP.DuelContext.IsFreeConsume( from ) )
this.Consume();
Consume();
}
}
}

4
Scripts/Items/Skill Items/Magical/Potions/Refresh Potions/BaseRefreshPotion.cs
View file

@ -32,10 +32,10 @@ namespace Server.Items
{
from.Stam += Scale( from, (int)(Refresh * from.StamMax) );
BasePotion.PlayDrinkEffect( from );
PlayDrinkEffect( from );
if ( !Engines.ConPVP.DuelContext.IsFreeConsume( from ) )
this.Consume();
Consume();
}
else
{

4
Scripts/Items/Skill Items/Magical/Potions/Strength Potions/BaseStrengthPotion.cs
View file

@ -47,10 +47,10 @@ namespace Server.Items
{
if ( DoStrength( from ) )
{
BasePotion.PlayDrinkEffect( from );
PlayDrinkEffect( from );
if ( !Engines.ConPVP.DuelContext.IsFreeConsume( from ) )
this.Consume();
Consume();
}
}
}

4
Scripts/Items/Skill Items/Magical/Scrolls/SpellScroll.cs
View file

@ -62,8 +62,8 @@ namespace Server.Items
{
base.GetContextMenuEntries( from, list );
if ( from.Alive && this.Movable )
list.Add( new ContextMenus.AddToSpellbookEntry() );
if ( from.Alive && Movable )
list.Add( new AddToSpellbookEntry() );
}
public override void OnDoubleClick( Mobile from )

14
Scripts/Items/Skill Items/Magical/Spellbook.cs
View file

@ -102,7 +102,7 @@ namespace Server.Items
case 7: type = SpellbookType.Mystic; break;
}
Spellbook book = Spellbook.Find( from, -1, type );
Spellbook book = Find( from, -1, type );
if ( book != null )
book.DisplayTo( from );
@ -353,7 +353,7 @@ namespace Server.Items
{
SpellbookType type = GetTypeForSpell( scroll.SpellID );
if ( type != this.SpellbookType )
if ( type != SpellbookType )
{
return false;
}
@ -452,7 +452,7 @@ namespace Server.Items
if ( strBonus != 0 || dexBonus != 0 || intBonus != 0 )
{
string modName = this.Serial.ToString();
string modName = Serial.ToString();
if ( strBonus != 0 )
from.AddStatMod( new StatMod( StatType.Str, modName + "Str", strBonus, TimeSpan.Zero ) );
@ -474,7 +474,7 @@ namespace Server.Items
{
m_AosSkillBonuses.Remove();
string modName = this.Serial.ToString();
string modName = Serial.ToString();
from.RemoveStatMod( modName + "Str" );
from.RemoveStatMod( modName + "Dex" );
@ -506,7 +506,7 @@ namespace Server.Items
if ( Parent == null )
{
to.Send( this.WorldPacket );
to.Send( WorldPacket );
}
else if ( Parent is Item )
{
@ -668,9 +668,9 @@ namespace Server.Items
base.OnSingleClick( from );
if ( m_Crafter != null )
this.LabelTo( from, 1050043, m_Crafter.Name ); // crafted by ~1_NAME~
LabelTo( from, 1050043, m_Crafter.Name ); // crafted by ~1_NAME~
this.LabelTo( from, 1042886, m_Count.ToString() );
LabelTo( from, 1042886, m_Count.ToString() );
}
public override void OnDoubleClick( Mobile from )