Fixes body expression style.

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

View file

@ -2,9 +2,12 @@ namespace Server.Gumps
{
public class BaseConfirmGump : Gump
{
public virtual int TitleNumber{ get{ return 1075083; } } // <center>Warning!</center>
public virtual int LabelNumber{ get{ return 1074975; } } // Are you sure you wish to select this?
public virtual int TitleNumber // <center>Warning!</center>
=> 1075083;
public virtual int LabelNumber // Are you sure you wish to select this?
=> 1074975;
private enum Buttons
{
Close,

View file

@ -10,37 +10,28 @@ namespace Server.Gumps
protected GumpBackground m_Background;
protected GumpImageTiled m_Offset;
public int CurrentPage
{
get{ return m_CurrentPage; }
}
public int CurrentPage => m_CurrentPage;
public int CurrentX
{
get{ return m_CurrentX; }
}
public int CurrentX => m_CurrentX;
public int CurrentY
{
get{ return m_CurrentY; }
}
public int CurrentY => m_CurrentY;
public BaseGridGump( int x, int y ) : base( x, y )
{
}
public virtual int BorderSize{ get{ return 10; } }
public virtual int OffsetSize{ get{ return 1; } }
public virtual int BorderSize => 10;
public virtual int OffsetSize => 1;
public virtual int EntryHeight{ get{ return 20; } }
public virtual int EntryHeight => 20;
public virtual int OffsetGumpID{ get{ return 0x0A40; } }
public virtual int HeaderGumpID{ get{ return 0x0E14; } }
public virtual int EntryGumpID{ get{ return 0x0BBC; } }
public virtual int BackGumpID{ get{ return 0x13BE; } }
public virtual int OffsetGumpID => 0x0A40;
public virtual int HeaderGumpID => 0x0E14;
public virtual int EntryGumpID => 0x0BBC;
public virtual int BackGumpID => 0x13BE;
public virtual int TextHue{ get{ return 0; } }
public virtual int TextOffsetX{ get{ return 2; } }
public virtual int TextHue => 0;
public virtual int TextOffsetX => 2;
public const int ArrowLeftID1 = 0x15E3;
public const int ArrowLeftID2 = 0x15E7;

View file

@ -13,24 +13,24 @@ namespace Server.Gumps
public virtual int ItemID
{
get{ return m_ItemID; }
set{ m_ItemID = value; }
get => m_ItemID;
set => m_ItemID = value;
}
public virtual int Hue
{
get{ return m_Hue; }
set{ m_Hue = value; }
get => m_Hue;
set => m_Hue = value;
}
public virtual int LocalizedTooltip
{
get{ return m_LocalizedTooltip; }
set{ m_LocalizedTooltip = value; }
get => m_LocalizedTooltip;
set => m_LocalizedTooltip = value;
}
public virtual TextDefinition Label
{
get{ return m_Label; }
set{ m_Label = value; }
get => m_Label;
set => m_Label = value;
}
public ImageTileButtonInfo( int itemID, int hue, TextDefinition label, int localizedTooltip )
@ -49,10 +49,10 @@ namespace Server.Gumps
{
private ImageTileButtonInfo[] m_Buttons;
protected ImageTileButtonInfo[] Buttons { get { return m_Buttons; } }
protected ImageTileButtonInfo[] Buttons => m_Buttons;
protected virtual int XItems{ get{ return 2; } }
protected virtual int YItems{ get { return 5; } }
protected virtual int XItems => 2;
protected virtual int YItems => 5;
public BaseImageTileButtonsGump( TextDefinition header, ArrayList buttons ) : this( header, (ImageTileButtonInfo[])buttons.ToArray( typeof( ImageTileButtonInfo ) ) )
{

View file

@ -20,10 +20,10 @@ namespace Server.Gumps
private int m_Hue;
private CAGCategory m_Parent;
public Type Type{ get{ return m_Type; } }
public int ItemID{ get{ return m_ItemID; } }
public int Hue{ get{ return m_Hue; } }
public CAGCategory Parent{ get{ return m_Parent; } }
public Type Type => m_Type;
public int ItemID => m_ItemID;
public int Hue => m_Hue;
public CAGCategory Parent => m_Parent;
public override string Caption => ( m_Type == null ? "bad type" : m_Type.Name );
@ -62,9 +62,9 @@ namespace Server.Gumps
private CAGNode[] m_Nodes;
private CAGCategory m_Parent;
public string Title{ get{ return m_Title; } }
public CAGNode[] Nodes{ get{ return m_Nodes; } }
public CAGCategory Parent{ get{ return m_Parent; } }
public string Title => m_Title;
public CAGNode[] Nodes => m_Nodes;
public CAGCategory Parent => m_Parent;
public override string Caption => m_Title;

View file

@ -37,28 +37,10 @@ namespace Server.Gumps
m_Location = new Point3D( x, y, z );
}
public ParentNode Parent
{
get
{
return m_Parent;
}
}
public ParentNode Parent => m_Parent;
public string Name
{
get
{
return m_Name;
}
}
public string Name => m_Name;
public Point3D Location
{
get
{
return m_Location;
}
}
public Point3D Location => m_Location;
}
}

View file

@ -29,29 +29,11 @@ namespace Server.Gumps
}
}
public Dictionary<Mobile, ParentNode> LastBranch
{
get
{
return m_LastBranch;
}
}
public Dictionary<Mobile, ParentNode> LastBranch => m_LastBranch;
public Map Map
{
get
{
return m_Map;
}
}
public Map Map => m_Map;
public ParentNode Root
{
get
{
return m_Root;
}
}
public ParentNode Root => m_Root;
private ParentNode Parse( XmlTextReader xml )
{

View file

@ -53,28 +53,10 @@ namespace Server.Gumps
}
}
public ParentNode Parent
{
get
{
return m_Parent;
}
}
public ParentNode Parent => m_Parent;
public object[] Children
{
get
{
return m_Children;
}
}
public object[] Children => m_Children;
public string Name
{
get
{
return m_Name;
}
}
public string Name => m_Name;
}
}

View file

@ -11,8 +11,8 @@ namespace Server.Guilds
private Guild m_Guild;
private PlayerMobile m_Player;
protected Guild guild{ get{ return m_Guild; } }
protected PlayerMobile player{ get{ return m_Player; } }
protected Guild guild => m_Guild;
protected PlayerMobile player => m_Player;
public BaseGuildGump( PlayerMobile pm, Guild g ) : this( pm, g, 10, 10 )
{

View file

@ -29,7 +29,7 @@ namespace Server.Guilds
m_List = list;
}
public virtual bool WillFilter{ get{ return (m_Filter.Length >= 0); } }
public virtual bool WillFilter => (m_Filter.Length >= 0);
public override void PopulateGump()
{
@ -192,8 +192,8 @@ namespace Server.Guilds
private int m_Width;
private IComparer<T> m_Comparer;
public TextDefinition Name{ get{ return m_Name; } }
public int Width{ get{ return m_Width; } }
public TextDefinition Name => m_Name;
public int Width => m_Width;
public IComparer<T> Comparer => m_Comparer;
public InfoField( TextDefinition name, int width, IComparer<T> comparer )
{

View file

@ -14,7 +14,8 @@ namespace Server.Guilds
public class GuildDiplomacyGump : BaseGuildListGump<Guild>
{
protected virtual bool AllowAdvancedSearch{ get{ return true; } }
protected virtual bool AllowAdvancedSearch => true;
#region Comparers
private class NameComparer : IComparer<Guild>
{

View file

@ -352,11 +352,11 @@ namespace Server.Gumps
return i;
}
public Type Type{ get{ return m_Type; } }
public int ItemID{ get{ return m_ItemID; } }
public int LocNumber{ get{ return m_LocNum; } }
public int ArtNumber{ get{ return m_ArtNum; } }
public bool LongText{ get{ return m_LongText; } }
public Type Type => m_Type;
public int ItemID => m_ItemID;
public int LocNumber => m_LocNum;
public int ArtNumber => m_ArtNum;
public bool LongText => m_LongText;
}
private class CustomCategory
@ -374,10 +374,10 @@ namespace Server.Gumps
m_LocNum = loc;
}
public bool CanDye{ get{ return m_CanDye; } }
public CustomItem[] Entries{ get{ return m_Entries; } }
public Layer Layer{ get{ return m_Layer; } }
public int LocNumber{ get{ return m_LocNum; } }
public bool CanDye => m_CanDye;
public CustomItem[] Entries => m_Entries;
public Layer Layer => m_Layer;
public int LocNumber => m_LocNum;
}
private static CustomCategory[] Categories = new CustomCategory[]{
@ -788,8 +788,8 @@ namespace Server.Gumps
private int m_ItemID;
private int m_Name;
public int ItemID{ get{ return m_ItemID; } }
public int Name{ get{ return m_Name; } }
public int ItemID => m_ItemID;
public int Name => m_Name;
public HairOrBeard( int itemID, int name )
{

View file

@ -40,8 +40,8 @@ namespace Server.Gumps
public int ArtID => m_Art;
public int BodyID => m_Body;
public int LocNumber => m_Num;
public int X{ get{ return m_X; } }
public int Y{ get{ return m_Y; } }
public int X => m_X;
public int Y => m_Y;
}

View file

@ -13,7 +13,7 @@ namespace Server.Gumps
{
private Runebook m_Book;
public Runebook Book{ get{ return m_Book; } }
public Runebook Book => m_Book;
public int GetMapHue( Map map )
{

View file

@ -428,8 +428,8 @@ namespace Server.Gumps
private string m_Name;
private SkillName[] m_Skills;
public string Name{ get{ return m_Name; } }
public SkillName[] Skills{ get{ return m_Skills; } }
public string Name => m_Name;
public SkillName[] Skills => m_Skills;
public SkillsGumpGroup( string name, SkillName[] skills )
{
@ -540,9 +540,6 @@ namespace Server.Gumps
} )
};
public static SkillsGumpGroup[] Groups
{
get{ return m_Groups; }
}
public static SkillsGumpGroup[] Groups => m_Groups;
}
}