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

14
Scripts/Items/Containers/BaseTreasureChest.cs
View file

@ -67,7 +67,7 @@ namespace Server.Items
{
get
{
if ( this.Locked )
if ( Locked )
return "a locked treasure chest";
return "a treasure chest";
@ -103,27 +103,27 @@ namespace Server.Items
switch( m_TreasureLevel )
{
case TreasureLevel.Level1:
this.RequiredSkill = this.LockLevel = 5;
RequiredSkill = LockLevel = 5;
break;
case TreasureLevel.Level2:
this.RequiredSkill = this.LockLevel = 20;
RequiredSkill = LockLevel = 20;
break;
case TreasureLevel.Level3:
this.RequiredSkill = this.LockLevel = 50;
RequiredSkill = LockLevel = 50;
break;
case TreasureLevel.Level4:
this.RequiredSkill = this.LockLevel = 70;
RequiredSkill = LockLevel = 70;
break;
case TreasureLevel.Level5:
this.RequiredSkill = this.LockLevel = 90;
RequiredSkill = LockLevel = 90;
break;
case TreasureLevel.Level6:
this.RequiredSkill = this.LockLevel = 100;
RequiredSkill = LockLevel = 100;
break;
}
}

8
Scripts/Items/Containers/Container.cs
View file

@ -33,7 +33,7 @@ namespace Server.Items
public override bool CheckHold( Mobile m, Item item, bool message, bool checkItems, int plusItems, int plusWeight )
{
if ( this.IsSecure && !BaseHouse.CheckHold( m, this, item, message, checkItems, plusItems, plusWeight ) )
if ( IsSecure && !BaseHouse.CheckHold( m, this, item, message, checkItems, plusItems, plusWeight ) )
return false;
return base.CheckHold( m, item, message, checkItems, plusItems, plusWeight );
@ -72,7 +72,7 @@ namespace Server.Items
return false;
}
List<Item> list = this.Items;
List<Item> list = Items;
for ( int i = 0; i < list.Count; ++i )
{
@ -124,7 +124,7 @@ namespace Server.Items
public override void OnDoubleClick( Mobile from )
{
if ( from.AccessLevel > AccessLevel.Player || from.InRange( this.GetWorldLocation(), 2 ) || this.RootParent is PlayerVendor )
if ( from.AccessLevel > AccessLevel.Player || from.InRange( GetWorldLocation(), 2 ) || RootParent is PlayerVendor )
Open( from );
else
from.LocalOverheadMessage( MessageType.Regular, 0x3B2, 1019045 ); // I can't reach that.
@ -173,7 +173,7 @@ namespace Server.Items
public override void OnItemRemoved( Item item )
{
if ( Items.Count == 0 )
this.Delete();
Delete();
base.OnItemRemoved( item );
}

10
Scripts/Items/Containers/FillableContainers.cs
View file

@ -73,7 +73,7 @@ namespace Server.Items
if ( m_Content != null )
return;
m_Content = FillableContent.Acquire( this.GetWorldLocation(), this.Map );
m_Content = FillableContent.Acquire( GetWorldLocation(), Map );
if ( m_Content != null )
Respawn();
@ -99,7 +99,7 @@ namespace Server.Items
{
int count = 0;
foreach( Item item in this.Items )
foreach( Item item in Items )
{
count += item.Amount;
}
@ -115,7 +115,7 @@ namespace Server.Items
{
if ( m_RespawnTimer == null )
{
int mins = Utility.RandomMinMax( this.MinRespawnMinutes, this.MaxRespawnMinutes );
int mins = Utility.RandomMinMax( MinRespawnMinutes, MaxRespawnMinutes );
TimeSpan delay = TimeSpan.FromMinutes( mins );
m_NextRespawnTime = DateTime.UtcNow + delay;
@ -198,7 +198,7 @@ namespace Server.Items
if ( item != null )
{
List<Item> list = this.Items;
List<Item> list = Items;
for( int j = 0; j < list.Count; ++j )
{
@ -734,7 +734,7 @@ namespace Server.Items
1,
new[]
{
typeof( Mobiles.Alchemist )
typeof( Alchemist )
},
new[]
{

4
Scripts/Items/Containers/LockableContainer.cs
View file

@ -288,9 +288,9 @@ namespace Server.Items
Locked = false;
Picker = from;
if ( this.TrapOnLockpick && ExecuteTrap( from ) )
if ( TrapOnLockpick && ExecuteTrap( from ) )
{
this.TrapOnLockpick = false;
TrapOnLockpick = false;
}
}

2
Scripts/Items/Containers/SalvageBag.cs
View file

@ -237,7 +237,7 @@ namespace Server.Items
from.SendLocalizedMessage( 1079974, String.Format( "{0}\t{1}", salvaged, salvaged + notSalvaged ) ); // Salvaged: ~1_COUNT~/~2_NUM~ tailored items
foreach (Item i in this.FindItemsByType(typeof(Item), true))
foreach (Item i in FindItemsByType(typeof(Item), true))
{
if ( ( i is Leather ) || ( i is Cloth ) || ( i is SpinedLeather ) || ( i is HornedLeather ) || ( i is BarbedLeather ) || ( i is Bandage ) || ( i is Bone ) )
{

2
Scripts/Items/Containers/Strongbox.cs
View file

@ -151,7 +151,7 @@ namespace Server.Items
metalBox.AddItem( subItem );
}
this.Delete();
Delete();
return metalBox;
}

8
Scripts/Items/Containers/TrappableContainer.cs
View file

@ -68,8 +68,8 @@ namespace Server.Items
{
if ( m_TrapType != TrapType.None )
{
Point3D loc = this.GetWorldLocation();
Map facet = this.Map;
Point3D loc = GetWorldLocation();
Map facet = Map;
if ( from.AccessLevel >= AccessLevel.GameMaster )
{
@ -189,7 +189,7 @@ namespace Server.Items
Effects.SendLocationParticles( EffectItem.Create( Location, Map, EffectItem.DefaultDuration ), 0x376A, 9, 32, 5022 );
Effects.PlaySound( Location, Map, 0x1F5 );
if ( this.TrapOnOpen )
if ( TrapOnOpen )
{
ExecuteTrap( from );
}
@ -197,7 +197,7 @@ namespace Server.Items
public override void Open( Mobile from )
{
if ( !this.TrapOnOpen || !ExecuteTrap( from ) )
if ( !TrapOnOpen || !ExecuteTrap( from ) )
base.Open( from );
}

10
Scripts/Items/Containers/TreasureMapChest.cs
View file

@ -284,12 +284,12 @@ namespace Server.Items
public override bool CheckLocked( Mobile from )
{
if ( !this.Locked )
if ( !Locked )
return false;
if ( this.Level == 0 && from.AccessLevel < AccessLevel.GameMaster )
if ( Level == 0 && from.AccessLevel < AccessLevel.GameMaster )
{
foreach ( Mobile m in this.Guardians )
foreach ( Mobile m in Guardians )
{
if ( m.Alive )
{
@ -322,7 +322,7 @@ namespace Server.Items
if ( p != null && p.Contains( m ) )
return true;
Map map = this.Map;
Map map = Map;
if ( map != null && (map.Rules & MapRules.HarmfulRestrictions) == 0 )
{
@ -475,7 +475,7 @@ namespace Server.Items
return;
from.SendLocalizedMessage( 1048124, "", 0x8A5 ); // The old, rusted chest crumbles when you hit it.
this.Delete();
Delete();
}
private class RemoveGump : Gump