warrentyexpired/ModernUO
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Fixes body expression style.

Browse source
This commit is contained in:
Kamron Batman 2018-09-14 08:46:14 -07:00
parent 3f0a72a62f
commit 33f5e77a24
957 changed files with 7424 additions and 15973 deletions
Download patch file Download diff file Expand all files Collapse all files

31
Scripts/Items/Addons/AddonComponent.cs
View file

@ -61,7 +61,7 @@ namespace Server.Items
[CommandProperty( AccessLevel.GameMaster )]
public int Number
{
get{ return m_LabelNumber; }
get => m_LabelNumber;
set{ m_LabelNumber = value; InvalidateProperties(); }
}
@ -111,36 +111,21 @@ namespace Server.Items
[CommandProperty( AccessLevel.GameMaster )]
public BaseAddon Addon
{
get
{
return m_Addon;
}
set
{
m_Addon = value;
}
get => m_Addon;
set => m_Addon = value;
}
[CommandProperty( AccessLevel.GameMaster )]
public Point3D Offset
{
get
{
return m_Offset;
}
set
{
m_Offset = value;
}
get => m_Offset;
set => m_Offset = value;
}
[Hue, CommandProperty( AccessLevel.GameMaster )]
public override int Hue
{
get
{
return base.Hue;
}
get => base.Hue;
set
{
base.Hue = value;
@ -150,8 +135,8 @@ namespace Server.Items
}
}
public virtual bool NeedsWall{ get{ return false; } }
public virtual Point3D WallPosition{ get{ return Point3D.Zero; } }
public virtual bool NeedsWall => false;
public virtual Point3D WallPosition => Point3D.Zero;
[Constructible]
public AddonComponent( int itemID ) : base( itemID )

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

@ -14,21 +14,21 @@ namespace Server.Items
[CommandProperty( AccessLevel.GameMaster )]
public BaseAddonContainer Addon
{
get { return m_Addon; }
set { m_Addon = value; }
get => m_Addon;
set => m_Addon = value;
}
[CommandProperty( AccessLevel.GameMaster )]
public Point3D Offset
{
get { return m_Offset; }
set { m_Offset = value; }
get => m_Offset;
set => m_Offset = value;
}
[Hue, CommandProperty( AccessLevel.GameMaster )]
public override int Hue
{
get { return base.Hue; }
get => base.Hue;
set
{
base.Hue = value;

32
Scripts/Items/Addons/ArcheryButteAddon.cs
View file

@ -17,43 +17,43 @@ namespace Server.Items
[CommandProperty( AccessLevel.GameMaster )]
public double MinSkill
{
get{ return m_MinSkill; }
set{ m_MinSkill = value; }
get => m_MinSkill;
set => m_MinSkill = value;
}
[CommandProperty( AccessLevel.GameMaster )]
public double MaxSkill
{
get{ return m_MaxSkill; }
set{ m_MaxSkill = value; }
get => m_MaxSkill;
set => m_MaxSkill = value;
}
[CommandProperty( AccessLevel.GameMaster )]
public DateTime LastUse
{
get{ return m_LastUse; }
set{ m_LastUse = value; }
get => m_LastUse;
set => m_LastUse = value;
}
[CommandProperty( AccessLevel.GameMaster )]
public bool FacingEast
{
get{ return ( ItemID == 0x100A ); }
set{ ItemID = value ? 0x100A : 0x100B; }
get => ( ItemID == 0x100A );
set => ItemID = value ? 0x100A : 0x100B;
}
[CommandProperty( AccessLevel.GameMaster )]
public int Arrows
{
get{ return m_Arrows; }
set{ m_Arrows = value; }
get => m_Arrows;
set => m_Arrows = value;
}
[CommandProperty( AccessLevel.GameMaster )]
public int Bolts
{
get{ return m_Bolts; }
set{ m_Bolts = value; }
get => m_Bolts;
set => m_Bolts = value;
}
[Constructible]
@ -102,8 +102,12 @@ namespace Server.Items
private int m_Total;
private int m_Count;
public int Total{ get{ return m_Total; } set{ m_Total = value; } }
public int Count{ get{ return m_Count; } set{ m_Count = value; } }
public int Total{ get => m_Total;
set => m_Total = value;
}
public int Count{ get => m_Count;
set => m_Count = value;
}
public void Record( int score )
{

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

@ -17,20 +17,11 @@ namespace Server.Items
private List<Mobile> m_Yes;
private List<Mobile> m_No;
public string[] Topic
{
get{ return m_Topic; }
}
public string[] Topic => m_Topic;
public List<Mobile> Yes
{
get{ return m_Yes; }
}
public List<Mobile> Yes => m_Yes;
public List<Mobile> No
{
get{ return m_No; }
}
public List<Mobile> No => m_No;
[Constructible]
public BallotBox() : base( 0x9A8 )

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

@ -29,7 +29,7 @@ namespace Server.Items
[CommandProperty( AccessLevel.GameMaster )]
public CraftResource Resource
{
get{ return m_Resource; }
get => m_Resource;
set
{
if ( m_Resource != value )
@ -64,7 +64,7 @@ namespace Server.Items
m_Components = new List<AddonComponent>();
}
public virtual bool RetainDeedHue{ get{ return false; } }
public virtual bool RetainDeedHue => false;
public virtual void OnChop( Mobile from )
{
@ -104,20 +104,11 @@ namespace Server.Items
}
}
public virtual BaseAddonDeed Deed{ get{ return null; } }
public virtual BaseAddonDeed Deed => null;
Item IAddon.Deed
{
get{ return this.Deed; }
}
Item IAddon.Deed => this.Deed;
public List<AddonComponent> Components
{
get
{
return m_Components;
}
}
public List<AddonComponent> Components => m_Components;
public BaseAddon( Serial serial ) : base( serial )
{
@ -237,15 +228,12 @@ namespace Server.Items
c.Delete();
}
public virtual bool ShareHue{ get{ return true; } }
public virtual bool ShareHue => true;
[Hue, CommandProperty( AccessLevel.GameMaster )]
public override int Hue
{
get
{
return base.Hue;
}
get => base.Hue;
set
{
if ( base.Hue != value )

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

@ -11,10 +11,7 @@ namespace Server.Items
[Hue, CommandProperty( AccessLevel.GameMaster )]
public override int Hue
{
get
{
return base.Hue;
}
get => base.Hue;
set
{
if ( base.Hue != value )
@ -37,7 +34,7 @@ namespace Server.Items
[CommandProperty( AccessLevel.GameMaster )]
public CraftResource Resource
{
get { return m_Resource; }
get => m_Resource;
set
{
if ( m_Resource != value )
@ -50,10 +47,7 @@ namespace Server.Items
}
}
Item IAddon.Deed
{
get { return this.Deed; }
}
Item IAddon.Deed => this.Deed;
public virtual bool RetainDeedHue => false;
public virtual bool NeedsWall => false;
@ -63,10 +57,7 @@ namespace Server.Items
private List<AddonContainerComponent> m_Components;
public List<AddonContainerComponent> Components
{
get { return m_Components; }
}
public List<AddonContainerComponent> Components => m_Components;
public BaseAddonContainer( int itemID ) : base( itemID )
{

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

@ -15,7 +15,7 @@ namespace Server.Items
[CommandProperty( AccessLevel.GameMaster )]
public CraftResource Resource
{
get{ return m_Resource; }
get => m_Resource;
set
{
if ( m_Resource != value )

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

@ -15,7 +15,7 @@ namespace Server.Items
[CommandProperty( AccessLevel.GameMaster )]
public CraftResource Resource
{
get{ return m_Resource; }
get => m_Resource;
set
{
if ( m_Resource != value )

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

@ -7,7 +7,7 @@ namespace Server.Items
public override bool NeedsWall => true;
public override Point3D WallPosition => this.East ? new Point3D( -1, 0, 0 ) : new Point3D( 0, -1, 0 );
public bool East{ get{ return this.ItemID == 0x1E2F; } }
public bool East => this.ItemID == 0x1E2F;
[Constructible]
public DartBoard() : this( true )

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

@ -42,7 +42,7 @@ namespace Server.Items
}
}
public bool Spinning{ get{ return m_Timer != null; } }
public bool Spinning => m_Timer != null;
public void BeginSpin( SpinCallback callback, Mobile from, int hue )
{

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

@ -43,7 +43,7 @@ namespace Server.Items
}
}
public bool Spinning{ get{ return m_Timer != null; } }
public bool Spinning => m_Timer != null;
public void BeginSpin( SpinCallback callback, Mobile from, int hue )
{

5
Scripts/Items/Addons/FireColumnAddon.cs
View file

@ -2,10 +2,7 @@ namespace Server.Items
{
public class FireColumnAddon : BaseAddon
{
public override bool ShareHue
{
get { return false; }
}
public override bool ShareHue => false;
[Constructible]
public FireColumnAddon()

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

@ -25,35 +25,23 @@ namespace Server.Items
private Timer m_Timer;
[CommandProperty( AccessLevel.GameMaster )]
public int MaxFlour
{
get{ return 2; }
}
public int MaxFlour => 2;
[CommandProperty( AccessLevel.GameMaster )]
public int CurFlour
{
get{ return m_Flour; }
get => m_Flour;
set{ m_Flour = Math.Max( 0, Math.Min( value, MaxFlour ) ); UpdateStage(); }
}
[CommandProperty( AccessLevel.GameMaster )]
public bool HasFlour
{
get{ return ( m_Flour > 0 ); }
}
public bool HasFlour => ( m_Flour > 0 );
[CommandProperty( AccessLevel.GameMaster )]
public bool IsFull
{
get{ return ( m_Flour >= MaxFlour ); }
}
public bool IsFull => ( m_Flour >= MaxFlour );
[CommandProperty( AccessLevel.GameMaster )]
public bool IsWorking
{
get{ return ( m_Timer != null ); }
}
public bool IsWorking => ( m_Timer != null );
public void StartWorking( Mobile from )
{

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

@ -11,35 +11,23 @@ namespace Server.Items
private Timer m_Timer;
[CommandProperty( AccessLevel.GameMaster )]
public int MaxFlour
{
get{ return 2; }
}
public int MaxFlour => 2;
[CommandProperty( AccessLevel.GameMaster )]
public int CurFlour
{
get{ return m_Flour; }
get => m_Flour;
set{ m_Flour = Math.Max( 0, Math.Min( value, MaxFlour ) ); UpdateStage(); }
}
[CommandProperty( AccessLevel.GameMaster )]
public bool HasFlour
{
get{ return ( m_Flour > 0 ); }
}
public bool HasFlour => ( m_Flour > 0 );
[CommandProperty( AccessLevel.GameMaster )]
public bool IsFull
{
get{ return ( m_Flour >= MaxFlour ); }
}
public bool IsFull => ( m_Flour >= MaxFlour );
[CommandProperty( AccessLevel.GameMaster )]
public bool IsWorking
{
get{ return ( m_Timer != null ); }
}
public bool IsWorking => ( m_Timer != null );
public void StartWorking( Mobile from )
{

5
Scripts/Items/Addons/JackOLantern.cs
View file

@ -4,10 +4,7 @@ namespace Server.Items
{
public class JackOLantern : BaseAddon
{
public override bool ShareHue
{
get { return false; }
}
public override bool ShareHue => false;
private AddonComponent GetComponent( int itemID, int hue )
{

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

@ -11,7 +11,9 @@ namespace Server.Items
private int m_Phase;
public int Phase{ get{ return m_Phase; } set{ m_Phase = value; } }
public int Phase{ get => m_Phase;
set => m_Phase = value;
}
[Constructible]
public LoomEastAddon()

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

@ -6,7 +6,9 @@ namespace Server.Items
private int m_Phase;
public int Phase{ get{ return m_Phase; } set{ m_Phase = value; } }
public int Phase{ get => m_Phase;
set => m_Phase = value;
}
[Constructible]
public LoomSouthAddon()

13
Scripts/Items/Addons/PickpocketDips.cs
View file

@ -13,22 +13,19 @@ namespace Server.Items
[CommandProperty( AccessLevel.GameMaster )]
public double MinSkill
{
get{ return m_MinSkill; }
set{ m_MinSkill = value; }
get => m_MinSkill;
set => m_MinSkill = value;
}
[CommandProperty( AccessLevel.GameMaster )]
public double MaxSkill
{
get{ return m_MaxSkill; }
set{ m_MaxSkill = value; }
get => m_MaxSkill;
set => m_MaxSkill = value;
}
[CommandProperty( AccessLevel.GameMaster )]
public bool Swinging
{
get{ return ( m_Timer != null ); }
}
public bool Swinging => ( m_Timer != null );
public PickpocketDip( int itemID ) : base( itemID )
{

5
Scripts/Items/Addons/PyramidAddon.cs
View file

@ -2,10 +2,7 @@ namespace Server.Items
{
public class PyramidAddon : BaseAddon
{
public override bool ShareHue
{
get { return false; }
}
public override bool ShareHue => false;
[Constructible]
public PyramidAddon()

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

@ -12,7 +12,7 @@ namespace Server.Items
[CommandProperty( AccessLevel.GameMaster )]
public bool Active
{
get { return m_Active; }
get => m_Active;
set
{
m_Active = value;
@ -25,21 +25,21 @@ namespace Server.Items
[CommandProperty( AccessLevel.GameMaster )]
public Point3D TeleOffset
{
get { return m_TeleOffset; }
set { m_TeleOffset = value; }
get => m_TeleOffset;
set => m_TeleOffset = value;
}
[CommandProperty(AccessLevel.GameMaster)]
public Point3D TelePoint
{
get { return new Point3D( Location.X + TeleOffset.X, Location.Y + TeleOffset.Y, Location.Z + TeleOffset.Z ); }
set { m_TeleOffset = new Point3D( value.X - Location.X, value.Y - Location.Y, value.Z - Location.Z ); }
get => new Point3D( Location.X + TeleOffset.X, Location.Y + TeleOffset.Y, Location.Z + TeleOffset.Z );
set => m_TeleOffset = new Point3D( value.X - Location.X, value.Y - Location.Y, value.Z - Location.Z );
}
[CommandProperty( AccessLevel.GameMaster )]
public SHTeleComponent TeleDest
{
get { return m_TeleDest; }
get => m_TeleDest;
set
{
m_TeleDest = value;
@ -49,10 +49,7 @@ namespace Server.Items
}
}
public override string DefaultName
{
get { return "a hole"; }
}
public override string DefaultName => "a hole";
[Constructible]
public SHTeleComponent() : this( 0x1775 )

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

@ -51,7 +51,7 @@ namespace Server.Items
}
}
public bool Spinning{ get{ return m_Timer != null; } }
public bool Spinning => m_Timer != null;
public void BeginSpin( SpinCallback callback, Mobile from, int hue )
{

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

@ -43,7 +43,7 @@ namespace Server.Items
}
}
public bool Spinning{ get{ return m_Timer != null; } }
public bool Spinning => m_Timer != null;
public void BeginSpin( SpinCallback callback, Mobile from, int hue )
{

13
Scripts/Items/Addons/TrainingDummies.cs
View file

@ -13,22 +13,19 @@ namespace Server.Items
[CommandProperty( AccessLevel.GameMaster )]
public double MinSkill
{
get{ return m_MinSkill; }
set{ m_MinSkill = value; }
get => m_MinSkill;
set => m_MinSkill = value;
}
[CommandProperty( AccessLevel.GameMaster )]
public double MaxSkill
{
get{ return m_MaxSkill; }
set{ m_MaxSkill = value; }
get => m_MaxSkill;
set => m_MaxSkill = value;
}
[CommandProperty( AccessLevel.GameMaster )]
public bool Swinging
{
get{ return ( m_Timer != null ); }
}
public bool Swinging => ( m_Timer != null );
[Constructible]
public TrainingDummy() : this( 0x1074 )

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

@ -31,7 +31,7 @@ namespace Server.Items
public int Quantity
{
get{ return 500; }
get => 500;
set{}
}
}

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

@ -31,7 +31,7 @@ namespace Server.Items
public int Quantity
{
get{ return 500; }
get => 500;
set{}
}
}