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/Addons/AddonComponent.cs
View file

@ -1,6 +1,6 @@
namespace Server.Items
{
[Server.Engines.Craft.Anvil]
[Engines.Craft.Anvil]
public class AnvilComponent : AddonComponent
{
[Constructible]
@ -27,7 +27,7 @@ namespace Server.Items
}
}
[Server.Engines.Craft.Forge]
[Engines.Craft.Forge]
public class ForgeComponent : AddonComponent
{
[Constructible]

2
Scripts/Items/Addons/BallotBox.cs
View file

@ -84,7 +84,7 @@ namespace Server.Items
public override void OnDoubleClick( Mobile from )
{
if ( !from.InRange( this.GetWorldLocation(), 2 ) )
if ( !from.InRange( GetWorldLocation(), 2 ) )
{
from.LocalOverheadMessage( MessageType.Regular, 0x3B2, 1019045 ); // I can't reach that.
}

4
Scripts/Items/Addons/BaseAddon.cs
View file

@ -106,7 +106,7 @@ namespace Server.Items
public virtual BaseAddonDeed Deed => null;
Item IAddon.Deed => this.Deed;
Item IAddon.Deed => Deed;
public List<AddonComponent> Components => m_Components;
@ -240,7 +240,7 @@ namespace Server.Items
{
base.Hue = value;
if ( !Deleted && this.ShareHue && m_Components != null )
if ( !Deleted && ShareHue && m_Components != null )
{
foreach ( AddonComponent c in m_Components )
c.Hue = value;

4
Scripts/Items/Addons/BaseAddonContainer.cs
View file

@ -18,7 +18,7 @@ namespace Server.Items
{
base.Hue = value;
if ( !Deleted && this.ShareHue && m_Components != null )
if ( !Deleted && ShareHue && m_Components != null )
{
Hue = value;
@ -47,7 +47,7 @@ namespace Server.Items
}
}
Item IAddon.Deed => this.Deed;
Item IAddon.Deed => Deed;
public virtual bool RetainDeedHue => false;
public virtual bool NeedsWall => false;

2
Scripts/Items/Addons/BaseAddonContainerDeed.cs
View file

@ -123,7 +123,7 @@ namespace Server.Items
BaseAddonContainer addon = m_Deed.Addon;
addon.Resource = m_Deed.Resource;
Server.Spells.SpellHelper.GetSurfaceTop( ref p );
Spells.SpellHelper.GetSurfaceTop( ref p );
BaseHouse house = null;

2
Scripts/Items/Addons/BaseAddonDeed.cs
View file

@ -89,7 +89,7 @@ namespace Server.Items
{
BaseAddon addon = m_Deed.Addon;
Server.Spells.SpellHelper.GetSurfaceTop( ref p );
Spells.SpellHelper.GetSurfaceTop( ref p );
BaseHouse house = null;

10
Scripts/Items/Addons/DartBoard.cs
View file

@ -5,9 +5,9 @@ namespace Server.Items
public class DartBoard : AddonComponent
{
public override bool NeedsWall => true;
public override Point3D WallPosition => this.East ? new Point3D( -1, 0, 0 ) : new Point3D( 0, -1, 0 );
public override Point3D WallPosition => East ? new Point3D( -1, 0, 0 ) : new Point3D( 0, -1, 0 );
public bool East => this.ItemID == 0x1E2F;
public bool East => ItemID == 0x1E2F;
[Constructible]
public DartBoard() : this( true )
@ -26,9 +26,9 @@ namespace Server.Items
public override void OnDoubleClick( Mobile from )
{
Direction dir;
if ( from.Location != this.Location )
if ( from.Location != Location )
dir = from.GetDirectionTo( this );
else if ( this.East )
else if ( East )
dir = Direction.West;
else
dir = Direction.North;
@ -39,7 +39,7 @@ namespace Server.Items
if ( !from.InRange( this, 4 ) || !from.InLOS( this ) )
canThrow = false;
else if ( this.East )
else if ( East )
canThrow = ( dir == Direction.Left || dir == Direction.West || dir == Direction.Up );
else
canThrow = ( dir == Direction.Up || dir == Direction.North || dir == Direction.Right );

4
Scripts/Items/Addons/FlourMillEastAddon.cs
View file

@ -60,7 +60,7 @@ namespace Server.Items
m_Timer = null;
}
if ( state is Mobile from && !from.Deleted && !this.Deleted && IsFull )
if ( state is Mobile from && !from.Deleted && !Deleted && IsFull )
{
SackFlour flour = new SackFlour();
@ -115,7 +115,7 @@ namespace Server.Items
public void UpdateStage( FlourMillStage stage )
{
List<AddonComponent> components = this.Components;
List<AddonComponent> components = Components;
int[][] stageTable = m_StageTable;

4
Scripts/Items/Addons/FlourMillSouthAddon.cs
View file

@ -46,7 +46,7 @@ namespace Server.Items
m_Timer = null;
}
if ( state is Mobile from && !from.Deleted && !this.Deleted && IsFull )
if ( state is Mobile from && !from.Deleted && !Deleted && IsFull )
{
SackFlour flour = new SackFlour();
@ -101,7 +101,7 @@ namespace Server.Items
public void UpdateStage( FlourMillStage stage )
{
List<AddonComponent> components = this.Components;
List<AddonComponent> components = Components;
int[][] stageTable = m_StageTable;

16
Scripts/Items/Addons/GozaMats.cs
View file

@ -40,7 +40,7 @@ namespace Server.Items
public class GozaMatEastDeed : BaseAddonDeed
{
public override BaseAddon Addon => new GozaMatEastAddon( this.Hue );
public override BaseAddon Addon => new GozaMatEastAddon( Hue );
public override int LabelNumber => 1030404; // goza (east)
[Constructible]
@ -107,7 +107,7 @@ namespace Server.Items
public class GozaMatSouthDeed : BaseAddonDeed
{
public override BaseAddon Addon => new GozaMatSouthAddon( this.Hue );
public override BaseAddon Addon => new GozaMatSouthAddon( Hue );
public override int LabelNumber => 1030405; // goza (south)
[Constructible]
@ -174,7 +174,7 @@ namespace Server.Items
public class SquareGozaMatEastDeed : BaseAddonDeed
{
public override BaseAddon Addon => new SquareGozaMatEastAddon( this.Hue );
public override BaseAddon Addon => new SquareGozaMatEastAddon( Hue );
public override int LabelNumber => 1030407; // square goza (east)
[Constructible]
@ -240,7 +240,7 @@ namespace Server.Items
public class SquareGozaMatSouthDeed : BaseAddonDeed
{
public override BaseAddon Addon => new SquareGozaMatSouthAddon( this.Hue );
public override BaseAddon Addon => new SquareGozaMatSouthAddon( Hue );
public override int LabelNumber => 1030406; // square goza (south)
@ -308,7 +308,7 @@ namespace Server.Items
public class BrocadeGozaMatEastDeed : BaseAddonDeed
{
public override BaseAddon Addon => new BrocadeGozaMatEastAddon( this.Hue );
public override BaseAddon Addon => new BrocadeGozaMatEastAddon( Hue );
public override int LabelNumber => 1030408; // brocade goza (east)
[Constructible]
@ -374,7 +374,7 @@ namespace Server.Items
public class BrocadeGozaMatSouthDeed : BaseAddonDeed
{
public override BaseAddon Addon => new BrocadeGozaMatSouthAddon( this.Hue );
public override BaseAddon Addon => new BrocadeGozaMatSouthAddon( Hue );
public override int LabelNumber => 1030409; // brocade goza (south)
[Constructible]
@ -439,7 +439,7 @@ namespace Server.Items
public class BrocadeSquareGozaMatEastDeed : BaseAddonDeed
{
public override BaseAddon Addon => new BrocadeSquareGozaMatEastAddon( this.Hue );
public override BaseAddon Addon => new BrocadeSquareGozaMatEastAddon( Hue );
public override int LabelNumber => 1030411; // brocade square goza (east)
[Constructible]
@ -505,7 +505,7 @@ namespace Server.Items
public class BrocadeSquareGozaMatSouthDeed : BaseAddonDeed
{
public override BaseAddon Addon => new BrocadeSquareGozaMatSouthAddon( this.Hue );
public override BaseAddon Addon => new BrocadeSquareGozaMatSouthAddon( Hue );
public override int LabelNumber => 1030410; // brocade square goza (south)

2
Scripts/Items/Addons/LargeStoneTableEastAddon.cs
View file

@ -41,7 +41,7 @@ namespace Server.Items
public class LargeStoneTableEastDeed : BaseAddonDeed
{
public override BaseAddon Addon => new LargeStoneTableEastAddon( this.Hue );
public override BaseAddon Addon => new LargeStoneTableEastAddon( Hue );
public override int LabelNumber => 1044511; // large stone table (east)
[Constructible]

2
Scripts/Items/Addons/LargeStoneTableSouthAddon.cs
View file

@ -41,7 +41,7 @@ namespace Server.Items
public class LargeStoneTableSouthDeed : BaseAddonDeed
{
public override BaseAddon Addon => new LargeStoneTableSouthAddon( this.Hue );
public override BaseAddon Addon => new LargeStoneTableSouthAddon( Hue );
public override int LabelNumber => 1044512; // large stone table (South)
[Constructible]

2
Scripts/Items/Addons/MediumStoneTableEastAddon.cs
View file

@ -40,7 +40,7 @@ namespace Server.Items
public class MediumStoneTableEastDeed : BaseAddonDeed
{
public override BaseAddon Addon => new MediumStoneTableEastAddon( this.Hue );
public override BaseAddon Addon => new MediumStoneTableEastAddon( Hue );
public override int LabelNumber => 1044508; // stone table (east)
[Constructible]

2
Scripts/Items/Addons/SHTeleporter.cs
View file

@ -85,7 +85,7 @@ namespace Server.Items
Map map = m_TeleDest.Map;
Point3D p = m_TeleDest.TelePoint;
Server.Mobiles.BaseCreature.TeleportPets( m, p, map );
Mobiles.BaseCreature.TeleportPets( m, p, map );
m.MoveToWorld( p, map );
}

2
Scripts/Items/Addons/ShrineOfWisdomAddon.cs
View file

@ -31,7 +31,7 @@ namespace Server.Items
}
}
[Server.Engines.Craft.Forge]
[Engines.Craft.Forge]
public class ShrineOfWisdomComponent : AddonComponent
{
public override int LabelNumber => 1062046; // Shrine of Wisdom