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

Changes properties to use automatic property initializers

Browse source
This commit is contained in:
Kamron Batman 2018-09-14 15:23:29 -07:00
parent f0a48ad431
commit 06fa31a7bf
623 changed files with 13072 additions and 19304 deletions
Download patch file Download diff file Expand all files Collapse all files

138
Server/Body.cs
View file

@ -35,8 +35,6 @@ namespace Server
public struct Body
{
private int m_BodyID;
private static BodyType[] m_Types;
static Body()
@ -81,88 +79,88 @@ namespace Server
public Body( int bodyID )
{
m_BodyID = bodyID;
BodyID = bodyID;
}
public BodyType Type
{
get
{
if ( m_BodyID >= 0 && m_BodyID < m_Types.Length )
return m_Types[m_BodyID];
if ( BodyID >= 0 && BodyID < m_Types.Length )
return m_Types[BodyID];
return BodyType.Empty;
}
}
public bool IsHuman => m_BodyID >= 0
&& m_BodyID < m_Types.Length
&& m_Types[m_BodyID] == BodyType.Human
&& m_BodyID != 402
&& m_BodyID != 403
&& m_BodyID != 607
&& m_BodyID != 608
&& m_BodyID != 694
&& m_BodyID != 695
&& m_BodyID != 970;
public bool IsHuman => BodyID >= 0
&& BodyID < m_Types.Length
&& m_Types[BodyID] == BodyType.Human
&& BodyID != 402
&& BodyID != 403
&& BodyID != 607
&& BodyID != 608
&& BodyID != 694
&& BodyID != 695
&& BodyID != 970;
public bool IsGargoyle => m_BodyID == 666
|| m_BodyID == 667
|| m_BodyID == 694
|| m_BodyID == 695;
public bool IsGargoyle => BodyID == 666
|| BodyID == 667
|| BodyID == 694
|| BodyID == 695;
public bool IsMale => m_BodyID == 183
|| m_BodyID == 185
|| m_BodyID == 400
|| m_BodyID == 402
|| m_BodyID == 605
|| m_BodyID == 607
|| m_BodyID == 666
|| m_BodyID == 694
|| m_BodyID == 750;
public bool IsMale => BodyID == 183
|| BodyID == 185
|| BodyID == 400
|| BodyID == 402
|| BodyID == 605
|| BodyID == 607
|| BodyID == 666
|| BodyID == 694
|| BodyID == 750;
public bool IsFemale => m_BodyID == 184
|| m_BodyID == 186
|| m_BodyID == 401
|| m_BodyID == 403
|| m_BodyID == 606
|| m_BodyID == 608
|| m_BodyID == 667
|| m_BodyID == 695
|| m_BodyID == 751;
public bool IsFemale => BodyID == 184
|| BodyID == 186
|| BodyID == 401
|| BodyID == 403
|| BodyID == 606
|| BodyID == 608
|| BodyID == 667
|| BodyID == 695
|| BodyID == 751;
public bool IsGhost => m_BodyID == 402
|| m_BodyID == 403
|| m_BodyID == 607
|| m_BodyID == 608
|| m_BodyID == 694
|| m_BodyID == 695
|| m_BodyID == 970;
public bool IsGhost => BodyID == 402
|| BodyID == 403
|| BodyID == 607
|| BodyID == 608
|| BodyID == 694
|| BodyID == 695
|| BodyID == 970;
public bool IsMonster => m_BodyID >= 0
&& m_BodyID < m_Types.Length
&& m_Types[m_BodyID] == BodyType.Monster;
public bool IsMonster => BodyID >= 0
&& BodyID < m_Types.Length
&& m_Types[BodyID] == BodyType.Monster;
public bool IsAnimal => m_BodyID >= 0
&& m_BodyID < m_Types.Length
&& m_Types[m_BodyID] == BodyType.Animal;
public bool IsAnimal => BodyID >= 0
&& BodyID < m_Types.Length
&& m_Types[BodyID] == BodyType.Animal;
public bool IsEmpty => m_BodyID >= 0
&& m_BodyID < m_Types.Length
&& m_Types[m_BodyID] == BodyType.Empty;
public bool IsEmpty => BodyID >= 0
&& BodyID < m_Types.Length
&& m_Types[BodyID] == BodyType.Empty;
public bool IsSea => m_BodyID >= 0
&& m_BodyID < m_Types.Length
&& m_Types[m_BodyID] == BodyType.Sea;
public bool IsSea => BodyID >= 0
&& BodyID < m_Types.Length
&& m_Types[BodyID] == BodyType.Sea;
public bool IsEquipment => m_BodyID >= 0
&& m_BodyID < m_Types.Length
&& m_Types[m_BodyID] == BodyType.Equipment;
public bool IsEquipment => BodyID >= 0
&& BodyID < m_Types.Length
&& m_Types[BodyID] == BodyType.Equipment;
public int BodyID => m_BodyID;
public int BodyID { get; }
public static implicit operator int( Body a )
{
return a.m_BodyID;
return a.BodyID;
}
public static implicit operator Body( int a )
@ -172,49 +170,49 @@ namespace Server
public override string ToString()
{
return $"0x{m_BodyID:X}";
return $"0x{BodyID:X}";
}
public override int GetHashCode()
{
return m_BodyID;
return BodyID;
}
public override bool Equals( object o )
{
if ( !(o is Body) ) return false;
return ((Body)o).m_BodyID == m_BodyID;
return ((Body)o).BodyID == BodyID;
}
public static bool operator == ( Body l, Body r )
{
return l.m_BodyID == r.m_BodyID;
return l.BodyID == r.BodyID;
}
public static bool operator != ( Body l, Body r )
{
return l.m_BodyID != r.m_BodyID;
return l.BodyID != r.BodyID;
}
public static bool operator > ( Body l, Body r )
{
return l.m_BodyID > r.m_BodyID;
return l.BodyID > r.BodyID;
}
public static bool operator >= ( Body l, Body r )
{
return l.m_BodyID >= r.m_BodyID;
return l.BodyID >= r.BodyID;
}
public static bool operator < ( Body l, Body r )
{
return l.m_BodyID < r.m_BodyID;
return l.BodyID < r.BodyID;
}
public static bool operator <= ( Body l, Body r )
{
return l.m_BodyID <= r.m_BodyID;
return l.BodyID <= r.BodyID;
}
}
}