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

29
Scripts/Items/Food/Beverage.cs
View file

@ -565,7 +565,7 @@ namespace Server.Items
}
}
public virtual bool ShowQuantity { get { return ( MaxQuantity > 1 ); } }
public virtual bool ShowQuantity => ( MaxQuantity > 1 );
public virtual bool Fillable => true;
public virtual bool Pourable => true;
@ -577,41 +577,32 @@ namespace Server.Items
public abstract int ComputeItemID();
[CommandProperty( AccessLevel.GameMaster )]
public bool IsEmpty
{
get { return ( m_Quantity <= 0 ); }
}
public bool IsEmpty => ( m_Quantity <= 0 );
[CommandProperty( AccessLevel.GameMaster )]
public bool ContainsAlchohol
{
get { return ( !IsEmpty && m_Content != BeverageType.Milk && m_Content != BeverageType.Water ); }
}
public bool ContainsAlchohol => ( !IsEmpty && m_Content != BeverageType.Milk && m_Content != BeverageType.Water );
[CommandProperty( AccessLevel.GameMaster )]
public bool IsFull
{
get { return ( m_Quantity >= MaxQuantity ); }
}
public bool IsFull => ( m_Quantity >= MaxQuantity );
[CommandProperty( AccessLevel.GameMaster )]
public Poison Poison
{
get { return m_Poison; }
set { m_Poison = value; }
get => m_Poison;
set => m_Poison = value;
}
[CommandProperty( AccessLevel.GameMaster )]
public Mobile Poisoner
{
get { return m_Poisoner; }
set { m_Poisoner = value; }
get => m_Poisoner;
set => m_Poisoner = value;
}
[CommandProperty( AccessLevel.GameMaster )]
public BeverageType Content
{
get { return m_Content; }
get => m_Content;
set
{
m_Content = value;
@ -630,7 +621,7 @@ namespace Server.Items
[CommandProperty( AccessLevel.GameMaster )]
public int Quantity
{
get { return m_Quantity; }
get => m_Quantity;
set
{
if ( value < 0 )

20
Scripts/Items/Food/CookableFood.cs
View file

@ -10,14 +10,8 @@ namespace Server.Items
[CommandProperty( AccessLevel.GameMaster )]
public int CookingLevel
{
get
{
return m_CookingLevel;
}
set
{
m_CookingLevel = value;
}
get => m_CookingLevel;
set => m_CookingLevel = value;
}
public CookableFood( int itemID, int cookingLevel ) : base( itemID )
@ -706,10 +700,7 @@ namespace Server.Items
// ********** BrightlyColoredEggs **********
public class BrightlyColoredEggs : CookableFood
{
public override string DefaultName
{
get { return "brightly colored eggs"; }
}
public override string DefaultName => "brightly colored eggs";
[Constructible]
public BrightlyColoredEggs() : base( 0x9B5, 15 )
@ -848,10 +839,7 @@ namespace Server.Items
public class RawFishSteak : CookableFood
{
public override double DefaultWeight
{
get { return 0.1; }
}
public override double DefaultWeight => 0.1;
[Constructible]
public RawFishSteak() : this( 1 )

2
Scripts/Items/Food/Cooking.cs
View file

@ -410,7 +410,7 @@ namespace Server.Items
[CommandProperty( AccessLevel.GameMaster )]
public int Quantity
{
get{ return m_Quantity; }
get => m_Quantity;
set
{
m_Quantity = Math.Min(20, Math.Max(0, value));

32
Scripts/Items/Food/Food.cs
View file

@ -12,22 +12,22 @@ namespace Server.Items
[CommandProperty( AccessLevel.GameMaster )]
public Mobile Poisoner
{
get { return m_Poisoner; }
set { m_Poisoner = value; }
get => m_Poisoner;
set => m_Poisoner = value;
}
[CommandProperty( AccessLevel.GameMaster )]
public Poison Poison
{
get { return m_Poison; }
set { m_Poison = value; }
get => m_Poison;
set => m_Poison = value;
}
[CommandProperty( AccessLevel.GameMaster )]
public int FillFactor
{
get { return m_FillFactor; }
set { m_FillFactor = value; }
get => m_FillFactor;
set => m_FillFactor = value;
}
public Food( int itemID ) : this( 1, itemID )
@ -280,10 +280,7 @@ namespace Server.Items
public class FishSteak : Food
{
public override double DefaultWeight
{
get { return 0.1; }
}
public override double DefaultWeight => 0.1;
[Constructible]
public FishSteak() : this( 1 )
@ -317,10 +314,7 @@ namespace Server.Items
public class CheeseWheel : Food
{
public override double DefaultWeight
{
get { return 0.1; }
}
public override double DefaultWeight => 0.1;
[Constructible]
public CheeseWheel() : this( 1 )
@ -354,10 +348,7 @@ namespace Server.Items
public class CheeseWedge : Food
{
public override double DefaultWeight
{
get { return 0.1; }
}
public override double DefaultWeight => 0.1;
[Constructible]
public CheeseWedge() : this( 1 )
@ -391,10 +382,7 @@ namespace Server.Items
public class CheeseSlice : Food
{
public override double DefaultWeight
{
get { return 0.1; }
}
public override double DefaultWeight => 0.1;
[Constructible]
public CheeseSlice() : this( 1 )