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

34
Scripts/Items/Aquarium/Aquarium.cs
View file

@ -14,10 +14,7 @@ namespace Server.Items
private int m_LiveCreatures;
[CommandProperty( AccessLevel.GameMaster )]
public int LiveCreatures
{
get{ return m_LiveCreatures; }
}
public int LiveCreatures => m_LiveCreatures;
[CommandProperty( AccessLevel.GameMaster )]
public int DeadCreatures
@ -57,10 +54,7 @@ namespace Server.Items
}
[CommandProperty( AccessLevel.GameMaster )]
public bool IsFull
{
get{ return ( Items.Count >= MaxItems ); }
}
public bool IsFull => ( Items.Count >= MaxItems );
// vacation info
private int m_VacationLeft;
@ -68,7 +62,7 @@ namespace Server.Items
[CommandProperty( AccessLevel.GameMaster )]
public int VacationLeft
{
get{ return m_VacationLeft; }
get => m_VacationLeft;
set{ m_VacationLeft = value; InvalidateProperties(); }
}
@ -79,37 +73,31 @@ namespace Server.Items
[CommandProperty( AccessLevel.GameMaster )]
public AquariumState Food
{
get{ return m_Food; }
get => m_Food;
set{ m_Food = value; InvalidateProperties(); }
}
[CommandProperty( AccessLevel.GameMaster )]
public AquariumState Water
{
get{ return m_Water; }
get => m_Water;
set{ m_Water = value; InvalidateProperties(); }
}
[CommandProperty( AccessLevel.GameMaster )]
public bool OptimalState
{
get{ return ( m_Food.State == (int) FoodState.Full && m_Water.State == (int) WaterState.Strong ); }
}
public bool OptimalState => ( m_Food.State == (int) FoodState.Full && m_Water.State == (int) WaterState.Strong );
// events
private List<int> m_Events;
private bool m_RewardAvailable;
private bool m_EvaluateDay;
public List<int> Events
{
get{ return m_Events; }
}
public List<int> Events => m_Events;
[CommandProperty( AccessLevel.GameMaster )]
public bool RewardAvailable
{
get{ return m_RewardAvailable; }
get => m_RewardAvailable;
set{ m_RewardAvailable = value; InvalidateProperties(); }
}
@ -941,10 +929,8 @@ namespace Server.Items
0x1C2, 0x1C3, 0x2A3, 0x47E, 0x51D
};
public static int[] FishHues
{
get{ return m_FishHues; }
}
public static int[] FishHues => m_FishHues;
#endregion
#region Context entries

14
Scripts/Items/Aquarium/AquariumState.cs
View file

@ -29,7 +29,7 @@ namespace Server.Items
[CommandProperty( AccessLevel.GameMaster )]
public int State
{
get{ return m_State; }
get => m_State;
set
{
m_State = value;
@ -45,22 +45,22 @@ namespace Server.Items
[CommandProperty( AccessLevel.GameMaster )]
public int Maintain
{
get{ return m_Maintain; }
set{ m_Maintain = value; }
get => m_Maintain;
set => m_Maintain = value;
}
[CommandProperty( AccessLevel.GameMaster )]
public int Improve
{
get{ return m_Improve; }
set{ m_Improve = value; }
get => m_Improve;
set => m_Improve = value;
}
[CommandProperty( AccessLevel.GameMaster )]
public int Added
{
get{ return m_Added; }
set{ m_Added = value; }
get => m_Added;
set => m_Added = value;
}
public AquariumState()

5
Scripts/Items/Aquarium/BaseFish.cs
View file

@ -9,10 +9,7 @@ namespace Server.Items
private Timer m_Timer;
[CommandProperty( AccessLevel.GameMaster )]
public bool Dead
{
get{ return ( ItemID == 0x3B0C ); }
}
public bool Dead => ( ItemID == 0x3B0C );
[Constructible]
public BaseFish( int itemID ) : base( itemID )

5
Scripts/Items/Aquarium/FishBowl.cs
View file

@ -9,10 +9,7 @@ namespace Server.Items
public override int LabelNumber => 1074499; // A fish bowl
[CommandProperty( AccessLevel.GameMaster )]
public bool Empty
{
get{ return ( Items.Count == 0 ); }
}
public bool Empty => ( Items.Count == 0 );
[CommandProperty( AccessLevel.GameMaster )]
public BaseFish Fish