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

89
Scripts/Engines/ConPVP/Games/BombingRun.cs
View file

@ -788,7 +788,8 @@ namespace Server.Engines.ConPVP
private bool m_North = false;
[CommandProperty( AccessLevel.GameMaster )]
public bool North { get { return m_North; } set { m_North = value; Remake(); } }
public bool North { get => m_North;
set { m_North = value; Remake(); } }
private static AddonComponent SetHue( AddonComponent ac, int hue )
{
@ -908,7 +909,7 @@ namespace Server.Engines.ConPVP
public BRTeamInfo Team
{
get { return m_Team; }
get => m_Team;
set
{
m_Team = value;
@ -1190,17 +1191,11 @@ namespace Server.Engines.ConPVP
return res;
}
public string Name
{
get { return m_Player.Name; }
}
public string Name => m_Player.Name;
public int Kills
{
get
{
return m_Kills;
}
get => m_Kills;
set
{
m_TeamInfo.Kills += ( value - m_Kills );
@ -1210,10 +1205,7 @@ namespace Server.Engines.ConPVP
public int Captures
{
get
{
return m_Captures;
}
get => m_Captures;
set
{
m_TeamInfo.Captures += ( value - m_Captures );
@ -1223,10 +1215,7 @@ namespace Server.Engines.ConPVP
public int Score
{
get
{
return m_Score;
}
get => m_Score;
set
{
m_TeamInfo.Score += ( value - m_Score );
@ -1277,38 +1266,40 @@ namespace Server.Engines.ConPVP
return res;
}
public string Name
{
get { return String.Format( "{0} Team", m_Name ); }
}
public string Name => String.Format( "{0} Team", m_Name );
public BRGame Game { get { return m_Game; } set { m_Game = value; } }
public BRGame Game { get => m_Game;
set => m_Game = value;
}
public int TeamID => m_TeamID;
public int Kills { get { return m_Kills; } set { m_Kills = value; } }
public int Captures { get { return m_Captures; } set { m_Captures = value; } }
public int Kills { get => m_Kills;
set => m_Kills = value;
}
public int Captures { get => m_Captures;
set => m_Captures = value;
}
public int Score { get { return m_Score; } set { m_Score = value; } }
public int Score { get => m_Score;
set => m_Score = value;
}
private BRPlayerInfo m_Leader;
public BRPlayerInfo Leader
{
get { return m_Leader; }
set { m_Leader = value; }
get => m_Leader;
set => m_Leader = value;
}
[CommandProperty( AccessLevel.GameMaster )]
public BRBoard Board
{
get { return m_Board; }
set { m_Board = value; }
get => m_Board;
set => m_Board = value;
}
public Hashtable Players
{
get { return m_Players; }
}
public Hashtable Players => m_Players;
public BRPlayerInfo this[Mobile mob]
{
@ -1327,21 +1318,21 @@ namespace Server.Engines.ConPVP
[CommandProperty( AccessLevel.GameMaster )]
public int Color
{
get { return m_Color; }
set { m_Color = value; }
get => m_Color;
set => m_Color = value;
}
[CommandProperty( AccessLevel.GameMaster )]
public string TeamName
{
get { return m_Name; }
set { m_Name = value; }
get => m_Name;
set => m_Name = value;
}
[CommandProperty( AccessLevel.GameMaster )]
public BRGoal Goal
{
get { return m_Goal; }
get => m_Goal;
set
{
m_Goal = value;
@ -1423,29 +1414,33 @@ namespace Server.Engines.ConPVP
public BRTeamInfo[] TeamInfo => m_TeamInfo;
[CommandProperty( AccessLevel.GameMaster )]
public BRTeamInfo Team1 { get { return m_TeamInfo[0]; } set { } }
public BRTeamInfo Team1 { get => m_TeamInfo[0];
set { } }
[CommandProperty( AccessLevel.GameMaster )]
public BRTeamInfo Team2 { get { return m_TeamInfo[1]; } set { } }
public BRTeamInfo Team2 { get => m_TeamInfo[1];
set { } }
[CommandProperty( AccessLevel.GameMaster )]
public BRTeamInfo Team3 { get { return m_TeamInfo[2]; } set { } }
public BRTeamInfo Team3 { get => m_TeamInfo[2];
set { } }
[CommandProperty( AccessLevel.GameMaster )]
public BRTeamInfo Team4 { get { return m_TeamInfo[3]; } set { } }
public BRTeamInfo Team4 { get => m_TeamInfo[3];
set { } }
[CommandProperty( AccessLevel.GameMaster )]
public TimeSpan Duration
{
get { return m_Duration; }
set { m_Duration = value; }
get => m_Duration;
set => m_Duration = value;
}
[CommandProperty( AccessLevel.GameMaster )]
public Point3D BombHome
{
get { return m_BombHome; }
set { m_BombHome = value; }
get => m_BombHome;
set => m_BombHome = value;
}
public override string Title => "Bombing Run";

113
Scripts/Engines/ConPVP/Games/CTF.cs
View file

@ -13,10 +13,7 @@ namespace Server.Engines.ConPVP
{
public CTFTeamInfo m_TeamInfo;
public override string DefaultName
{
get { return "scoreboard"; }
}
public override string DefaultName => "scoreboard";
[Constructible]
public CTFBoard()
@ -233,10 +230,7 @@ namespace Server.Engines.ConPVP
{
public CTFTeamInfo m_TeamInfo;
public override string DefaultName
{
get { return "old people cookies"; }
}
public override string DefaultName => "old people cookies";
public Mobile m_Fragger;
public DateTime m_FragTime;
@ -548,17 +542,11 @@ namespace Server.Engines.ConPVP
public Mobile Player => m_Player;
string IRankedCTF.Name
{
get { return m_Player.Name; }
}
string IRankedCTF.Name => m_Player.Name;
public int Kills
{
get
{
return m_Kills;
}
get => m_Kills;
set
{
m_TeamInfo.Kills += ( value - m_Kills );
@ -568,10 +556,7 @@ namespace Server.Engines.ConPVP
public int Captures
{
get
{
return m_Captures;
}
get => m_Captures;
set
{
m_TeamInfo.Captures += ( value - m_Captures );
@ -581,10 +566,7 @@ namespace Server.Engines.ConPVP
public int Score
{
get
{
return m_Score;
}
get => m_Score;
set
{
m_TeamInfo.Score += ( value - m_Score );
@ -623,38 +605,40 @@ namespace Server.Engines.ConPVP
private Dictionary<Mobile, CTFPlayerInfo> m_Players;
string IRankedCTF.Name
{
get { return String.Format( "{0} Team", m_Name ); }
}
string IRankedCTF.Name => String.Format( "{0} Team", m_Name );
public CTFGame Game { get { return m_Game; } set { m_Game = value; } }
public CTFGame Game { get => m_Game;
set => m_Game = value;
}
public int TeamID => m_TeamID;
public int Kills { get { return m_Kills; } set { m_Kills = value; } }
public int Captures { get { return m_Captures; } set { m_Captures = value; } }
public int Kills { get => m_Kills;
set => m_Kills = value;
}
public int Captures { get => m_Captures;
set => m_Captures = value;
}
public int Score { get { return m_Score; } set { m_Score = value; } }
public int Score { get => m_Score;
set => m_Score = value;
}
private CTFPlayerInfo m_Leader;
public CTFPlayerInfo Leader
{
get { return m_Leader; }
set { m_Leader = value; }
get => m_Leader;
set => m_Leader = value;
}
[CommandProperty( AccessLevel.GameMaster )]
public CTFBoard Board
{
get { return m_Board; }
set { m_Board = value; }
get => m_Board;
set => m_Board = value;
}
public Dictionary<Mobile, CTFPlayerInfo> Players
{
get { return m_Players; }
}
public Dictionary<Mobile, CTFPlayerInfo> Players => m_Players;
public CTFPlayerInfo this[Mobile mob]
{
@ -673,29 +657,29 @@ namespace Server.Engines.ConPVP
[CommandProperty( AccessLevel.GameMaster )]
public int Color
{
get { return m_Color; }
set { m_Color = value; }
get => m_Color;
set => m_Color = value;
}
[CommandProperty( AccessLevel.GameMaster )]
public string Name
{
get { return m_Name; }
set { m_Name = value; }
get => m_Name;
set => m_Name = value;
}
[CommandProperty( AccessLevel.GameMaster )]
public CTFFlag Flag
{
get { return m_Flag; }
set { m_Flag = value; }
get => m_Flag;
set => m_Flag = value;
}
[CommandProperty( AccessLevel.GameMaster )]
public Point3D Origin
{
get { return m_Origin; }
set { m_Origin = value; }
get => m_Origin;
set => m_Origin = value;
}
public CTFTeamInfo( int teamID )
@ -787,40 +771,45 @@ namespace Server.Engines.ConPVP
public CTFTeamInfo[] TeamInfo => m_TeamInfo;
[CommandProperty( AccessLevel.GameMaster )]
public CTFTeamInfo Team1 { get { return m_TeamInfo[0]; } set { } }
public CTFTeamInfo Team1 { get => m_TeamInfo[0];
set { } }
[CommandProperty( AccessLevel.GameMaster )]
public CTFTeamInfo Team2 { get { return m_TeamInfo[1]; } set { } }
public CTFTeamInfo Team2 { get => m_TeamInfo[1];
set { } }
[CommandProperty( AccessLevel.GameMaster )]
public CTFTeamInfo Team3 { get { return m_TeamInfo[2]; } set { } }
public CTFTeamInfo Team3 { get => m_TeamInfo[2];
set { } }
[CommandProperty( AccessLevel.GameMaster )]
public CTFTeamInfo Team4 { get { return m_TeamInfo[3]; } set { } }
public CTFTeamInfo Team4 { get => m_TeamInfo[3];
set { } }
[CommandProperty( AccessLevel.GameMaster )]
public CTFTeamInfo Team5 { get { return m_TeamInfo[4]; } set { } }
public CTFTeamInfo Team5 { get => m_TeamInfo[4];
set { } }
[CommandProperty( AccessLevel.GameMaster )]
public CTFTeamInfo Team6 { get { return m_TeamInfo[5]; } set { } }
public CTFTeamInfo Team6 { get => m_TeamInfo[5];
set { } }
[CommandProperty( AccessLevel.GameMaster )]
public CTFTeamInfo Team7 { get { return m_TeamInfo[6]; } set { } }
public CTFTeamInfo Team7 { get => m_TeamInfo[6];
set { } }
[CommandProperty( AccessLevel.GameMaster )]
public CTFTeamInfo Team8 { get { return m_TeamInfo[7]; } set { } }
public CTFTeamInfo Team8 { get => m_TeamInfo[7];
set { } }
[CommandProperty( AccessLevel.GameMaster )]
public TimeSpan Duration
{
get { return m_Duration; }
set { m_Duration = value; }
get => m_Duration;
set => m_Duration = value;
}
public override string Title
{
get { return "CTF"; }
}
public override string Title => "CTF";
public override string GetTeamName( int teamID )
{

98
Scripts/Engines/ConPVP/Games/DoubleDom.cs
View file

@ -11,10 +11,7 @@ namespace Server.Engines.ConPVP
{
public DDTeamInfo m_TeamInfo;
public override string DefaultName
{
get { return "scoreboard"; }
}
public override string DefaultName => "scoreboard";
[Constructible]
public DDBoard()
@ -238,17 +235,11 @@ namespace Server.Engines.ConPVP
public Mobile Player => m_Player;
public string Name
{
get { return m_Player.Name; }
}
public string Name => m_Player.Name;
public int Kills
{
get
{
return m_Kills;
}
get => m_Kills;
set
{
m_TeamInfo.Kills += ( value - m_Kills );
@ -258,10 +249,7 @@ namespace Server.Engines.ConPVP
public int Captures
{
get
{
return m_Captures;
}
get => m_Captures;
set
{
m_TeamInfo.Captures += ( value - m_Captures );
@ -271,10 +259,7 @@ namespace Server.Engines.ConPVP
public int Score
{
get
{
return m_Score;
}
get => m_Score;
set
{
m_TeamInfo.Score += ( value - m_Score );
@ -312,38 +297,40 @@ namespace Server.Engines.ConPVP
private Dictionary<Mobile, DDPlayerInfo> m_Players;
public string Name
{
get { return String.Format( "{0} Team", m_Name ); }
}
public string Name => String.Format( "{0} Team", m_Name );
public DDGame Game { get { return m_Game; } set { m_Game = value; } }
public DDGame Game { get => m_Game;
set => m_Game = value;
}
public int TeamID => m_TeamID;
public int Kills { get { return m_Kills; } set { m_Kills = value; } }
public int Captures { get { return m_Captures; } set { m_Captures = value; } }
public int Kills { get => m_Kills;
set => m_Kills = value;
}
public int Captures { get => m_Captures;
set => m_Captures = value;
}
public int Score { get { return m_Score; } set { m_Score = value; } }
public int Score { get => m_Score;
set => m_Score = value;
}
private DDPlayerInfo m_Leader;
public DDPlayerInfo Leader
{
get { return m_Leader; }
set { m_Leader = value; }
get => m_Leader;
set => m_Leader = value;
}
[CommandProperty( AccessLevel.GameMaster )]
public DDBoard Board
{
get { return m_Board; }
set { m_Board = value; }
get => m_Board;
set => m_Board = value;
}
public Dictionary<Mobile, DDPlayerInfo> Players
{
get { return m_Players; }
}
public Dictionary<Mobile, DDPlayerInfo> Players => m_Players;
public DDPlayerInfo this[Mobile mob]
{
@ -362,22 +349,22 @@ namespace Server.Engines.ConPVP
[CommandProperty( AccessLevel.GameMaster )]
public int Color
{
get { return m_Color; }
set { m_Color = value; }
get => m_Color;
set => m_Color = value;
}
[CommandProperty( AccessLevel.GameMaster )]
public string TeamName
{
get { return m_Name; }
set { m_Name = value; }
get => m_Name;
set => m_Name = value;
}
[CommandProperty( AccessLevel.GameMaster )]
public Point3D Origin
{
get { return m_Origin; }
set { m_Origin = value; }
get => m_Origin;
set => m_Origin = value;
}
public DDTeamInfo( int teamID )
@ -446,30 +433,33 @@ namespace Server.Engines.ConPVP
public DDTeamInfo[] TeamInfo => m_TeamInfo;
[CommandProperty( AccessLevel.GameMaster )]
public DDTeamInfo Team1 { get { return m_TeamInfo[0]; } set { } }
public DDTeamInfo Team1 { get => m_TeamInfo[0];
set { } }
[CommandProperty( AccessLevel.GameMaster )]
public DDTeamInfo Team2 { get { return m_TeamInfo[1]; } set { } }
public DDTeamInfo Team2 { get => m_TeamInfo[1];
set { } }
[CommandProperty( AccessLevel.GameMaster )]
public DDWayPoint PointA { get { return m_PointA; } set { m_PointA = value; } }
public DDWayPoint PointA { get => m_PointA;
set => m_PointA = value;
}
[CommandProperty( AccessLevel.GameMaster )]
public DDWayPoint PointB { get { return m_PointB; } set { m_PointB = value; } }
public DDWayPoint PointB { get => m_PointB;
set => m_PointB = value;
}
private DDWayPoint m_PointA, m_PointB;
[CommandProperty( AccessLevel.GameMaster )]
public TimeSpan Duration
{
get { return m_Duration; }
set { m_Duration = value; }
get => m_Duration;
set => m_Duration = value;
}
public override string Title
{
get { return "DoubleDom"; }
}
public override string Title => "DoubleDom";
public override string GetTeamName( int teamID )
{
@ -1109,7 +1099,7 @@ namespace Server.Engines.ConPVP
public DDGame Game
{
get{ return m_Game; }
get => m_Game;
set
{
m_Game = value;
@ -1124,7 +1114,7 @@ namespace Server.Engines.ConPVP
public DDTeamInfo TeamOwner
{
get{ return m_TeamOwner; }
get => m_TeamOwner;
set
{
m_TeamOwner = value;

129
Scripts/Engines/ConPVP/Games/KingOfTheHill.cs
View file

@ -58,18 +58,12 @@ namespace Server.Engines.ConPVP
writer.WriteEncodedInt(m_ScoreInterval);
}
public Mobile King
{
get
{
return m_King;
}
}
public Mobile King => m_King;
public KHGame Game
public KHGame Game
{
get { return m_Game; }
set
get => m_Game;
set
{
if (m_Game != value)
{
@ -82,7 +76,9 @@ namespace Server.Engines.ConPVP
}
[CommandProperty(AccessLevel.GameMaster)]
public int ScoreInterval { get { return m_ScoreInterval; } set { m_ScoreInterval = value; } }
public int ScoreInterval { get => m_ScoreInterval;
set => m_ScoreInterval = value;
}
public int CapturesSoFar
{
@ -307,8 +303,8 @@ namespace Server.Engines.ConPVP
[CommandProperty(AccessLevel.GameMaster)]
public KHController Controller
{
get { return m_Controller; }
set
get => m_Controller;
set
{
if (m_Controller != value)
{
@ -563,11 +559,8 @@ namespace Server.Engines.ConPVP
public int Kills
{
get
{
return m_Kills;
}
set
get => m_Kills;
set
{
m_TeamInfo.Kills += (value - m_Kills);
m_Kills = value;
@ -576,11 +569,8 @@ namespace Server.Engines.ConPVP
public int Captures
{
get
{
return m_Captures;
}
set
get => m_Captures;
set
{
m_TeamInfo.Captures += (value - m_Captures);
m_Captures = value;
@ -589,11 +579,8 @@ namespace Server.Engines.ConPVP
public int Score
{
get
{
return m_Score;
}
set
get => m_Score;
set
{
m_TeamInfo.Score += (value - m_Score);
m_Score = value;
@ -644,27 +631,32 @@ namespace Server.Engines.ConPVP
}
}
public KHGame Game { get { return m_Game; } set { m_Game = value; } }
public KHGame Game { get => m_Game;
set => m_Game = value;
}
public int TeamID => m_TeamID;
public int Kills { get { return m_Kills; } set { m_Kills = value; } }
public int Captures { get { return m_Captures; } set { m_Captures = value; } }
public int Score { get { return m_Score; } set { m_Score = value; } }
public int Kills { get => m_Kills;
set => m_Kills = value;
}
public int Captures { get => m_Captures;
set => m_Captures = value;
}
public int Score { get => m_Score;
set => m_Score = value;
}
private KHPlayerInfo m_Leader;
public KHPlayerInfo Leader
{
get { return m_Leader; }
set { m_Leader = value; }
get => m_Leader;
set => m_Leader = value;
}
public Hashtable Players
{
get { return m_Players; }
}
public Hashtable Players => m_Players;
public KHPlayerInfo this[Mobile mob]
public KHPlayerInfo this[Mobile mob]
{
get
{
@ -681,15 +673,15 @@ namespace Server.Engines.ConPVP
[CommandProperty(AccessLevel.GameMaster)]
public int Color
{
get { return m_Color; }
set { m_Color = value; }
get => m_Color;
set => m_Color = value;
}
[CommandProperty(AccessLevel.GameMaster)]
public string TeamName
{
get { return m_Name; }
set { m_Name = value; }
get => m_Name;
set => m_Name = value;
}
public KHTeamInfo(int teamID)
@ -755,58 +747,71 @@ namespace Server.Engines.ConPVP
public KHTeamInfo[] TeamInfo => m_TeamInfo;
[CommandProperty(AccessLevel.GameMaster)]
public KHTeamInfo Team1_W { get { return m_TeamInfo[0]; } set { } }
public KHTeamInfo Team1_W { get => m_TeamInfo[0];
set { } }
[CommandProperty(AccessLevel.GameMaster)]
public KHTeamInfo Team2_E { get { return m_TeamInfo[1]; } set { } }
public KHTeamInfo Team2_E { get => m_TeamInfo[1];
set { } }
[CommandProperty(AccessLevel.GameMaster)]
public KHTeamInfo Team3_N { get { return m_TeamInfo[2]; } set { } }
public KHTeamInfo Team3_N { get => m_TeamInfo[2];
set { } }
[CommandProperty(AccessLevel.GameMaster)]
public KHTeamInfo Team4_S { get { return m_TeamInfo[3]; } set { } }
public KHTeamInfo Team4_S { get => m_TeamInfo[3];
set { } }
[CommandProperty(AccessLevel.GameMaster)]
public KHTeamInfo Team5_NW { get { return m_TeamInfo[4]; } set { } }
public KHTeamInfo Team5_NW { get => m_TeamInfo[4];
set { } }
[CommandProperty(AccessLevel.GameMaster)]
public KHTeamInfo Team6_SE { get { return m_TeamInfo[5]; } set { } }
public KHTeamInfo Team6_SE { get => m_TeamInfo[5];
set { } }
[CommandProperty(AccessLevel.GameMaster)]
public KHTeamInfo Team7_SW { get { return m_TeamInfo[6]; } set { } }
public KHTeamInfo Team7_SW { get => m_TeamInfo[6];
set { } }
[CommandProperty(AccessLevel.GameMaster)]
public KHTeamInfo Team8_NE { get { return m_TeamInfo[7]; } set { } }
public KHTeamInfo Team8_NE { get => m_TeamInfo[7];
set { } }
public HillOfTheKing[] Hills => m_Hills;
[CommandProperty(AccessLevel.GameMaster)]
public HillOfTheKing Hill1 { get { return m_Hills[0]; } set { m_Hills[0] = value; } }
public HillOfTheKing Hill1 { get => m_Hills[0];
set => m_Hills[0] = value;
}
[CommandProperty(AccessLevel.GameMaster)]
public HillOfTheKing Hill2 { get { return m_Hills[1]; } set { m_Hills[1] = value; } }
public HillOfTheKing Hill2 { get => m_Hills[1];
set => m_Hills[1] = value;
}
[CommandProperty(AccessLevel.GameMaster)]
public HillOfTheKing Hill3 { get { return m_Hills[2]; } set { m_Hills[2] = value; } }
public HillOfTheKing Hill3 { get => m_Hills[2];
set => m_Hills[2] = value;
}
[CommandProperty(AccessLevel.GameMaster)]
public HillOfTheKing Hill4 { get { return m_Hills[3]; } set { m_Hills[3] = value; } }
public HillOfTheKing Hill4 { get => m_Hills[3];
set => m_Hills[3] = value;
}
public ArrayList Boards => m_Boards;
[CommandProperty(AccessLevel.GameMaster)]
public TimeSpan Duration
{
get { return m_Duration; }
set { m_Duration = value; }
get => m_Duration;
set => m_Duration = value;
}
public override string Title
{
get { return "King of the Hill"; }
}
public override string Title => "King of the Hill";
public override string GetTeamName(int teamID)
public override string GetTeamName(int teamID)
{
return m_TeamInfo[teamID % m_TeamInfo.Length].Name;
}