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

48
Server/Gumps/Gump.cs
View file

@ -70,25 +70,13 @@ namespace Server.Gumps
// m_Strings.Clear();
}
public int TypeID
{
get
{
return m_TypeID;
}
}
public int TypeID => m_TypeID;
public List<GumpEntry> Entries
{
get{ return m_Entries; }
}
public List<GumpEntry> Entries => m_Entries;
public int Serial
{
get
{
return m_Serial;
}
get => m_Serial;
set
{
if ( m_Serial != value )
@ -101,10 +89,7 @@ namespace Server.Gumps
public int X
{
get
{
return m_X;
}
get => m_X;
set
{
if ( m_X != value )
@ -117,10 +102,7 @@ namespace Server.Gumps
public int Y
{
get
{
return m_Y;
}
get => m_Y;
set
{
if ( m_Y != value )
@ -133,10 +115,7 @@ namespace Server.Gumps
public bool Disposable
{
get
{
return m_Disposable;
}
get => m_Disposable;
set
{
if ( m_Disposable != value )
@ -149,10 +128,7 @@ namespace Server.Gumps
public bool Resizable
{
get
{
return m_Resizable;
}
get => m_Resizable;
set
{
if ( m_Resizable != value )
@ -165,10 +141,7 @@ namespace Server.Gumps
public bool Dragable
{
get
{
return m_Dragable;
}
get => m_Dragable;
set
{
if ( m_Dragable != value )
@ -181,10 +154,7 @@ namespace Server.Gumps
public bool Closable
{
get
{
return m_Closable;
}
get => m_Closable;
set
{
if ( m_Closable != value )

40
Server/Gumps/GumpAlphaRegion.cs
View file

@ -30,50 +30,26 @@ namespace Server.Gumps
public int X
{
get
{
return m_X;
}
set
{
Delta( ref m_X, value );
}
get => m_X;
set => Delta( ref m_X, value );
}
public int Y
{
get
{
return m_Y;
}
set
{
Delta( ref m_Y, value );
}
get => m_Y;
set => Delta( ref m_Y, value );
}
public int Width
{
get
{
return m_Width;
}
set
{
Delta( ref m_Width, value );
}
get => m_Width;
set => Delta( ref m_Width, value );
}
public int Height
{
get
{
return m_Height;
}
set
{
Delta( ref m_Height, value );
}
get => m_Height;
set => Delta( ref m_Height, value );
}
public GumpAlphaRegion( int x, int y, int width, int height )

50
Server/Gumps/GumpBackground.cs
View file

@ -31,62 +31,32 @@ namespace Server.Gumps
public int X
{
get
{
return m_X;
}
set
{
Delta( ref m_X, value );
}
get => m_X;
set => Delta( ref m_X, value );
}
public int Y
{
get
{
return m_Y;
}
set
{
Delta( ref m_Y, value );
}
get => m_Y;
set => Delta( ref m_Y, value );
}
public int Width
{
get
{
return m_Width;
}
set
{
Delta( ref m_Width, value );
}
get => m_Width;
set => Delta( ref m_Width, value );
}
public int Height
{
get
{
return m_Height;
}
set
{
Delta( ref m_Height, value );
}
get => m_Height;
set => Delta( ref m_Height, value );
}
public int GumpID
{
get
{
return m_GumpID;
}
set
{
Delta( ref m_GumpID, value );
}
get => m_GumpID;
set => Delta( ref m_GumpID, value );
}
public GumpBackground( int x, int y, int width, int height, int gumpID )

65
Server/Gumps/GumpButton.cs
View file

@ -50,70 +50,37 @@ namespace Server.Gumps
public int X
{
get
{
return m_X;
}
set
{
Delta( ref m_X, value );
}
get => m_X;
set => Delta( ref m_X, value );
}
public int Y
{
get
{
return m_Y;
}
set
{
Delta( ref m_Y, value );
}
get => m_Y;
set => Delta( ref m_Y, value );
}
public int NormalID
{
get
{
return m_ID1;
}
set
{
Delta( ref m_ID1, value );
}
get => m_ID1;
set => Delta( ref m_ID1, value );
}
public int PressedID
{
get
{
return m_ID2;
}
set
{
Delta( ref m_ID2, value );
}
get => m_ID2;
set => Delta( ref m_ID2, value );
}
public int ButtonID
{
get
{
return m_ButtonID;
}
set
{
Delta( ref m_ButtonID, value );
}
get => m_ButtonID;
set => Delta( ref m_ButtonID, value );
}
public GumpButtonType Type
{
get
{
return m_Type;
}
get => m_Type;
set
{
if ( m_Type != value )
@ -132,14 +99,8 @@ namespace Server.Gumps
public int Param
{
get
{
return m_Param;
}
set
{
Delta( ref m_Param, value );
}
get => m_Param;
set => Delta( ref m_Param, value );
}
public override string Compile( NetState ns )

60
Server/Gumps/GumpCheck.cs
View file

@ -32,74 +32,38 @@ namespace Server.Gumps
public int X
{
get
{
return m_X;
}
set
{
Delta( ref m_X, value );
}
get => m_X;
set => Delta( ref m_X, value );
}
public int Y
{
get
{
return m_Y;
}
set
{
Delta( ref m_Y, value );
}
get => m_Y;
set => Delta( ref m_Y, value );
}
public int InactiveID
{
get
{
return m_ID1;
}
set
{
Delta( ref m_ID1, value );
}
get => m_ID1;
set => Delta( ref m_ID1, value );
}
public int ActiveID
{
get
{
return m_ID2;
}
set
{
Delta( ref m_ID2, value );
}
get => m_ID2;
set => Delta( ref m_ID2, value );
}
public bool InitialState
{
get
{
return m_InitialState;
}
set
{
Delta( ref m_InitialState, value );
}
get => m_InitialState;
set => Delta( ref m_InitialState, value );
}
public int SwitchID
{
get
{
return m_SwitchID;
}
set
{
Delta( ref m_SwitchID, value );
}
get => m_SwitchID;
set => Delta( ref m_SwitchID, value );
}
public GumpCheck( int x, int y, int inactiveID, int activeID, bool initialState, int switchID )

5
Server/Gumps/GumpEntry.cs
View file

@ -64,10 +64,7 @@ namespace Server.Gumps
public Gump Parent
{
get
{
return m_Parent;
}
get => m_Parent;
set
{
if ( m_Parent != value )

10
Server/Gumps/GumpGroup.cs
View file

@ -34,14 +34,8 @@ namespace Server.Gumps
public int Group
{
get
{
return m_Group;
}
set
{
Delta( ref m_Group, value );
}
get => m_Group;
set => Delta( ref m_Group, value );
}
public override string Compile( NetState ns )

70
Server/Gumps/GumpHtml.cs
View file

@ -32,86 +32,44 @@ namespace Server.Gumps
public int X
{
get
{
return m_X;
}
set
{
Delta( ref m_X, value );
}
get => m_X;
set => Delta( ref m_X, value );
}
public int Y
{
get
{
return m_Y;
}
set
{
Delta( ref m_Y, value );
}
get => m_Y;
set => Delta( ref m_Y, value );
}
public int Width
{
get
{
return m_Width;
}
set
{
Delta( ref m_Width, value );
}
get => m_Width;
set => Delta( ref m_Width, value );
}
public int Height
{
get
{
return m_Height;
}
set
{
Delta( ref m_Height, value );
}
get => m_Height;
set => Delta( ref m_Height, value );
}
public string Text
{
get
{
return m_Text;
}
set
{
Delta( ref m_Text, value );
}
get => m_Text;
set => Delta( ref m_Text, value );
}
public bool Background
{
get
{
return m_Background;
}
set
{
Delta( ref m_Background, value );
}
get => m_Background;
set => Delta( ref m_Background, value );
}
public bool Scrollbar
{
get
{
return m_Scrollbar;
}
set
{
Delta( ref m_Scrollbar, value );
}
get => m_Scrollbar;
set => Delta( ref m_Scrollbar, value );
}
public GumpHtml( int x, int y, int width, int height, string text, bool background, bool scrollbar )

95
Server/Gumps/GumpHtmlLocalized.cs
View file

@ -43,118 +43,61 @@ namespace Server.Gumps
public int X
{
get
{
return m_X;
}
set
{
Delta( ref m_X, value );
}
get => m_X;
set => Delta( ref m_X, value );
}
public int Y
{
get
{
return m_Y;
}
set
{
Delta( ref m_Y, value );
}
get => m_Y;
set => Delta( ref m_Y, value );
}
public int Width
{
get
{
return m_Width;
}
set
{
Delta( ref m_Width, value );
}
get => m_Width;
set => Delta( ref m_Width, value );
}
public int Height
{
get
{
return m_Height;
}
set
{
Delta( ref m_Height, value );
}
get => m_Height;
set => Delta( ref m_Height, value );
}
public int Number
{
get
{
return m_Number;
}
set
{
Delta( ref m_Number, value );
}
get => m_Number;
set => Delta( ref m_Number, value );
}
public string Args
{
get
{
return m_Args;
}
set
{
Delta( ref m_Args, value );
}
get => m_Args;
set => Delta( ref m_Args, value );
}
public int Color
{
get
{
return m_Color;
}
set
{
Delta( ref m_Color, value );
}
get => m_Color;
set => Delta( ref m_Color, value );
}
public bool Background
{
get
{
return m_Background;
}
set
{
Delta( ref m_Background, value );
}
get => m_Background;
set => Delta( ref m_Background, value );
}
public bool Scrollbar
{
get
{
return m_Scrollbar;
}
set
{
Delta( ref m_Scrollbar, value );
}
get => m_Scrollbar;
set => Delta( ref m_Scrollbar, value );
}
public GumpHtmlLocalizedType Type
{
get
{
return m_Type;
}
get => m_Type;
set
{
if ( m_Type != value )

40
Server/Gumps/GumpImage.cs
View file

@ -43,50 +43,26 @@ namespace Server.Gumps
public int X
{
get
{
return m_X;
}
set
{
Delta( ref m_X, value );
}
get => m_X;
set => Delta( ref m_X, value );
}
public int Y
{
get
{
return m_Y;
}
set
{
Delta( ref m_Y, value );
}
get => m_Y;
set => Delta( ref m_Y, value );
}
public int GumpID
{
get
{
return m_GumpID;
}
set
{
Delta( ref m_GumpID, value );
}
get => m_GumpID;
set => Delta( ref m_GumpID, value );
}
public int Hue
{
get
{
return m_Hue;
}
set
{
Delta( ref m_Hue, value );
}
get => m_Hue;
set => Delta( ref m_Hue, value );
}
public override string Compile( NetState ns )

115
Server/Gumps/GumpImageTileButton.cs
View file

@ -62,70 +62,37 @@ namespace Server.Gumps
public int X
{
get
{
return m_X;
}
set
{
Delta( ref m_X, value );
}
get => m_X;
set => Delta( ref m_X, value );
}
public int Y
{
get
{
return m_Y;
}
set
{
Delta( ref m_Y, value );
}
get => m_Y;
set => Delta( ref m_Y, value );
}
public int NormalID
{
get
{
return m_ID1;
}
set
{
Delta( ref m_ID1, value );
}
get => m_ID1;
set => Delta( ref m_ID1, value );
}
public int PressedID
{
get
{
return m_ID2;
}
set
{
Delta( ref m_ID2, value );
}
get => m_ID2;
set => Delta( ref m_ID2, value );
}
public int ButtonID
{
get
{
return m_ButtonID;
}
set
{
Delta( ref m_ButtonID, value );
}
get => m_ButtonID;
set => Delta( ref m_ButtonID, value );
}
public GumpButtonType Type
{
get
{
return m_Type;
}
get => m_Type;
set
{
if ( m_Type != value )
@ -144,74 +111,38 @@ namespace Server.Gumps
public int Param
{
get
{
return m_Param;
}
set
{
Delta( ref m_Param, value );
}
get => m_Param;
set => Delta( ref m_Param, value );
}
public int ItemID
{
get
{
return m_ItemID;
}
set
{
Delta( ref m_ItemID, value );
}
get => m_ItemID;
set => Delta( ref m_ItemID, value );
}
public int Hue
{
get
{
return m_Hue;
}
set
{
Delta( ref m_Hue, value );
}
get => m_Hue;
set => Delta( ref m_Hue, value );
}
public int Width
{
get
{
return m_Width;
}
set
{
Delta( ref m_Width, value );
}
get => m_Width;
set => Delta( ref m_Width, value );
}
public int Height
{
get
{
return m_Height;
}
set
{
Delta( ref m_Height, value );
}
get => m_Height;
set => Delta( ref m_Height, value );
}
public int LocalizedTooltip
{
get
{
return m_LocalizedTooltip;
}
set
{
m_LocalizedTooltip = value;
}
get => m_LocalizedTooltip;
set => m_LocalizedTooltip = value;
}
public override string Compile( NetState ns )

50
Server/Gumps/GumpImageTiled.cs
View file

@ -40,62 +40,32 @@ namespace Server.Gumps
public int X
{
get
{
return m_X;
}
set
{
Delta( ref m_X, value );
}
get => m_X;
set => Delta( ref m_X, value );
}
public int Y
{
get
{
return m_Y;
}
set
{
Delta( ref m_Y, value );
}
get => m_Y;
set => Delta( ref m_Y, value );
}
public int Width
{
get
{
return m_Width;
}
set
{
Delta( ref m_Width, value );
}
get => m_Width;
set => Delta( ref m_Width, value );
}
public int Height
{
get
{
return m_Height;
}
set
{
Delta( ref m_Height, value );
}
get => m_Height;
set => Delta( ref m_Height, value );
}
public int GumpID
{
get
{
return m_GumpID;
}
set
{
Delta( ref m_GumpID, value );
}
get => m_GumpID;
set => Delta( ref m_GumpID, value );
}
public override string Compile( NetState ns )

40
Server/Gumps/GumpItem.cs
View file

@ -43,50 +43,26 @@ namespace Server.Gumps
public int X
{
get
{
return m_X;
}
set
{
Delta( ref m_X, value );
}
get => m_X;
set => Delta( ref m_X, value );
}
public int Y
{
get
{
return m_Y;
}
set
{
Delta( ref m_Y, value );
}
get => m_Y;
set => Delta( ref m_Y, value );
}
public int ItemID
{
get
{
return m_ItemID;
}
set
{
Delta( ref m_ItemID, value );
}
get => m_ItemID;
set => Delta( ref m_ItemID, value );
}
public int Hue
{
get
{
return m_Hue;
}
set
{
Delta( ref m_Hue, value );
}
get => m_Hue;
set => Delta( ref m_Hue, value );
}
public override string Compile( NetState ns )

10
Server/Gumps/GumpItemProperty.cs
View file

@ -34,14 +34,8 @@ namespace Server.Gumps
public int Serial
{
get
{
return m_Serial;
}
set
{
Delta( ref m_Serial, value );
}
get => m_Serial;
set => Delta( ref m_Serial, value );
}
public override string Compile( NetState ns )

40
Server/Gumps/GumpLabel.cs
View file

@ -39,50 +39,26 @@ namespace Server.Gumps
public int X
{
get
{
return m_X;
}
set
{
Delta( ref m_X, value );
}
get => m_X;
set => Delta( ref m_X, value );
}
public int Y
{
get
{
return m_Y;
}
set
{
Delta( ref m_Y, value );
}
get => m_Y;
set => Delta( ref m_Y, value );
}
public int Hue
{
get
{
return m_Hue;
}
set
{
Delta( ref m_Hue, value );
}
get => m_Hue;
set => Delta( ref m_Hue, value );
}
public string Text
{
get
{
return m_Text;
}
set
{
Delta( ref m_Text, value );
}
get => m_Text;
set => Delta( ref m_Text, value );
}
public override string Compile( NetState ns )

60
Server/Gumps/GumpLabelCropped.cs
View file

@ -32,74 +32,38 @@ namespace Server.Gumps
public int X
{
get
{
return m_X;
}
set
{
Delta( ref m_X, value );
}
get => m_X;
set => Delta( ref m_X, value );
}
public int Y
{
get
{
return m_Y;
}
set
{
Delta( ref m_Y, value );
}
get => m_Y;
set => Delta( ref m_Y, value );
}
public int Width
{
get
{
return m_Width;
}
set
{
Delta( ref m_Width, value );
}
get => m_Width;
set => Delta( ref m_Width, value );
}
public int Height
{
get
{
return m_Height;
}
set
{
Delta( ref m_Height, value );
}
get => m_Height;
set => Delta( ref m_Height, value );
}
public int Hue
{
get
{
return m_Hue;
}
set
{
Delta( ref m_Hue, value );
}
get => m_Hue;
set => Delta( ref m_Hue, value );
}
public string Text
{
get
{
return m_Text;
}
set
{
Delta( ref m_Text, value );
}
get => m_Text;
set => Delta( ref m_Text, value );
}
public GumpLabelCropped( int x, int y, int width, int height, int hue, string text )

10
Server/Gumps/GumpPage.cs
View file

@ -34,14 +34,8 @@ namespace Server.Gumps
public int Page
{
get
{
return m_Page;
}
set
{
Delta( ref m_Page, value );
}
get => m_Page;
set => Delta( ref m_Page, value );
}
public override string Compile( NetState ns )

60
Server/Gumps/GumpRadio.cs
View file

@ -32,74 +32,38 @@ namespace Server.Gumps
public int X
{
get
{
return m_X;
}
set
{
Delta( ref m_X, value );
}
get => m_X;
set => Delta( ref m_X, value );
}
public int Y
{
get
{
return m_Y;
}
set
{
Delta( ref m_Y, value );
}
get => m_Y;
set => Delta( ref m_Y, value );
}
public int InactiveID
{
get
{
return m_ID1;
}
set
{
Delta( ref m_ID1, value );
}
get => m_ID1;
set => Delta( ref m_ID1, value );
}
public int ActiveID
{
get
{
return m_ID2;
}
set
{
Delta( ref m_ID2, value );
}
get => m_ID2;
set => Delta( ref m_ID2, value );
}
public bool InitialState
{
get
{
return m_InitialState;
}
set
{
Delta( ref m_InitialState, value );
}
get => m_InitialState;
set => Delta( ref m_InitialState, value );
}
public int SwitchID
{
get
{
return m_SwitchID;
}
set
{
Delta( ref m_SwitchID, value );
}
get => m_SwitchID;
set => Delta( ref m_SwitchID, value );
}
public GumpRadio( int x, int y, int inactiveID, int activeID, bool initialState, int switchID )

70
Server/Gumps/GumpTextEntry.cs
View file

@ -33,86 +33,44 @@ namespace Server.Gumps
public int X
{
get
{
return m_X;
}
set
{
Delta( ref m_X, value );
}
get => m_X;
set => Delta( ref m_X, value );
}
public int Y
{
get
{
return m_Y;
}
set
{
Delta( ref m_Y, value );
}
get => m_Y;
set => Delta( ref m_Y, value );
}
public int Width
{
get
{
return m_Width;
}
set
{
Delta( ref m_Width, value );
}
get => m_Width;
set => Delta( ref m_Width, value );
}
public int Height
{
get
{
return m_Height;
}
set
{
Delta( ref m_Height, value );
}
get => m_Height;
set => Delta( ref m_Height, value );
}
public int Hue
{
get
{
return m_Hue;
}
set
{
Delta( ref m_Hue, value );
}
get => m_Hue;
set => Delta( ref m_Hue, value );
}
public int EntryID
{
get
{
return m_EntryID;
}
set
{
Delta( ref m_EntryID, value );
}
get => m_EntryID;
set => Delta( ref m_EntryID, value );
}
public string InitialText
{
get
{
return m_InitialText;
}
set
{
Delta( ref m_InitialText, value );
}
get => m_InitialText;
set => Delta( ref m_InitialText, value );
}
public GumpTextEntry( int x, int y, int width, int height, int hue, int entryID, string initialText )

64
Server/Gumps/GumpTextEntryLimited.cs
View file

@ -31,75 +31,43 @@ namespace Server.Gumps {
private int m_Size;
public int X {
get {
return m_X;
}
set {
Delta( ref m_X, value );
}
get => m_X;
set => Delta( ref m_X, value );
}
public int Y {
get {
return m_Y;
}
set {
Delta( ref m_Y, value );
}
get => m_Y;
set => Delta( ref m_Y, value );
}
public int Width {
get {
return m_Width;
}
set {
Delta( ref m_Width, value );
}
get => m_Width;
set => Delta( ref m_Width, value );
}
public int Height {
get {
return m_Height;
}
set {
Delta( ref m_Height, value );
}
get => m_Height;
set => Delta( ref m_Height, value );
}
public int Hue {
get {
return m_Hue;
}
set {
Delta( ref m_Hue, value );
}
get => m_Hue;
set => Delta( ref m_Hue, value );
}
public int EntryID {
get {
return m_EntryID;
}
set {
Delta( ref m_EntryID, value );
}
get => m_EntryID;
set => Delta( ref m_EntryID, value );
}
public string InitialText {
get {
return m_InitialText;
}
set {
Delta( ref m_InitialText, value );
}
get => m_InitialText;
set => Delta( ref m_InitialText, value );
}
public int Size {
get {
return m_Size;
}
set {
Delta( ref m_Size, value );
}
get => m_Size;
set => Delta( ref m_Size, value );
}
public GumpTextEntryLimited( int x, int y, int width, int height, int hue, int entryID, string initialText, int size ) {

10
Server/Gumps/GumpTooltip.cs
View file

@ -34,14 +34,8 @@ namespace Server.Gumps
public int Number
{
get
{
return m_Number;
}
set
{
Delta( ref m_Number, value );
}
get => m_Number;
set => Delta( ref m_Number, value );
}
public override string Compile( NetState ns )

40
Server/Gumps/RelayInfo.cs
View file

@ -31,21 +31,9 @@ namespace Server.Gumps
m_Text = text;
}
public int EntryID
{
get
{
return m_EntryID;
}
}
public int EntryID => m_EntryID;
public string Text
{
get
{
return m_Text;
}
}
public string Text => m_Text;
}
public class RelayInfo
@ -61,29 +49,11 @@ namespace Server.Gumps
m_TextEntries = textEntries;
}
public int ButtonID
{
get
{
return m_ButtonID;
}
}
public int ButtonID => m_ButtonID;
public int[] Switches
{
get
{
return m_Switches;
}
}
public int[] Switches => m_Switches;
public TextRelay[] TextEntries
{
get
{
return m_TextEntries;
}
}
public TextRelay[] TextEntries => m_TextEntries;
public bool IsSwitched( int switchID )
{