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

4
Scripts/Engines/ConPVP/AcceptDuelGump.cs
View file

@ -120,8 +120,8 @@ namespace Server.Engines.ConPVP
public Mobile m_Ignored;
public DateTime m_Expire;
public Mobile Ignored{ get{ return m_Ignored; } }
public bool Expired{ get{ return ( DateTime.UtcNow >= m_Expire ); } }
public Mobile Ignored => m_Ignored;
public bool Expired => ( DateTime.UtcNow >= m_Expire );
private static TimeSpan ExpireDelay = TimeSpan.FromMinutes( 15.0 );

120
Scripts/Engines/ConPVP/Arena.cs
View file

@ -10,16 +10,16 @@ namespace Server.Engines.ConPVP
private bool m_IsPrivate;
[CommandProperty( AccessLevel.GameMaster )]
public Arena Arena{ get{ return m_Arena; } set{} }
public Arena Arena{ get => m_Arena;
set{} }
[CommandProperty( AccessLevel.GameMaster )]
public bool IsPrivate{ get{ return m_IsPrivate; } set{ m_IsPrivate = value; } }
public override string DefaultName
{
get { return "arena controller"; }
public bool IsPrivate{ get => m_IsPrivate;
set => m_IsPrivate = value;
}
public override string DefaultName => "arena controller";
[Constructible]
public ArenaController() : base( 0x1B7A )
{
@ -86,7 +86,9 @@ namespace Server.Engines.ConPVP
private static List<ArenaController> m_Instances = new List<ArenaController>();
public static List<ArenaController> Instances{ get{ return m_Instances; } set{ m_Instances = value; } }
public static List<ArenaController> Instances{ get => m_Instances;
set => m_Instances = value;
}
}
[PropertyObject]
@ -94,31 +96,47 @@ namespace Server.Engines.ConPVP
{
private Point3D[] m_Points;
public Point3D[] Points{ get{ return m_Points; } }
public Point3D[] Points => m_Points;
[CommandProperty( AccessLevel.GameMaster )]
public Point3D EdgeWest{ get{ return m_Points[0]; } set{ m_Points[0] = value; } }
public Point3D EdgeWest{ get => m_Points[0];
set => m_Points[0] = value;
}
[CommandProperty( AccessLevel.GameMaster )]
public Point3D EdgeEast{ get{ return m_Points[1]; } set{ m_Points[1] = value; } }
public Point3D EdgeEast{ get => m_Points[1];
set => m_Points[1] = value;
}
[CommandProperty( AccessLevel.GameMaster )]
public Point3D EdgeNorth{ get{ return m_Points[2]; } set{ m_Points[2] = value; } }
public Point3D EdgeNorth{ get => m_Points[2];
set => m_Points[2] = value;
}
[CommandProperty( AccessLevel.GameMaster )]
public Point3D EdgeSouth{ get{ return m_Points[3]; } set{ m_Points[3] = value; } }
public Point3D EdgeSouth{ get => m_Points[3];
set => m_Points[3] = value;
}
[CommandProperty( AccessLevel.GameMaster )]
public Point3D CornerNW{ get{ return m_Points[4]; } set{ m_Points[4] = value; } }
public Point3D CornerNW{ get => m_Points[4];
set => m_Points[4] = value;
}
[CommandProperty( AccessLevel.GameMaster )]
public Point3D CornerSE{ get{ return m_Points[5]; } set{ m_Points[5] = value; } }
public Point3D CornerSE{ get => m_Points[5];
set => m_Points[5] = value;
}
[CommandProperty( AccessLevel.GameMaster )]
public Point3D CornerSW{ get{ return m_Points[6]; } set{ m_Points[6] = value; } }
public Point3D CornerSW{ get => m_Points[6];
set => m_Points[6] = value;
}
[CommandProperty( AccessLevel.GameMaster )]
public Point3D CornerNE{ get{ return m_Points[7]; } set{ m_Points[7] = value; } }
public Point3D CornerNE{ get => m_Points[7];
set => m_Points[7] = value;
}
public override string ToString()
{
@ -179,14 +197,14 @@ namespace Server.Engines.ConPVP
[CommandProperty( AccessLevel.GameMaster )]
public LadderController Ladder
{
get{ return m_Ladder; }
set{ m_Ladder = value; }
get => m_Ladder;
set => m_Ladder = value;
}
[CommandProperty( AccessLevel.GameMaster )]
public bool IsGuarded
{
get{ return m_IsGuarded; }
get => m_IsGuarded;
set
{
m_IsGuarded = value;
@ -207,7 +225,7 @@ namespace Server.Engines.ConPVP
[CommandProperty( AccessLevel.GameMaster )]
public TournamentController Tournament
{
get{ return m_Tournament; }
get => m_Tournament;
set
{
if ( m_Tournament != null )
@ -223,21 +241,21 @@ namespace Server.Engines.ConPVP
[CommandProperty( AccessLevel.GameMaster )]
public Mobile Announcer
{
get{ return m_Announcer; }
set{ m_Announcer = value; }
get => m_Announcer;
set => m_Announcer = value;
}
[CommandProperty( AccessLevel.GameMaster )]
public string Name
{
get{ return m_Name; }
get => m_Name;
set{ m_Name = value; if ( m_Active ) m_Arenas.Sort(); }
}
[CommandProperty( AccessLevel.GameMaster )]
public Map Facet
{
get{ return m_Facet; }
get => m_Facet;
set
{
m_Facet = value;
@ -256,7 +274,9 @@ namespace Server.Engines.ConPVP
}
[CommandProperty( AccessLevel.GameMaster )]
public Rectangle2D Bounds{ get{ return m_Bounds; } set{ m_Bounds = value; } }
public Rectangle2D Bounds{ get => m_Bounds;
set => m_Bounds = value;
}
private SafeZone m_Region;
@ -279,7 +299,7 @@ namespace Server.Engines.ConPVP
[CommandProperty( AccessLevel.GameMaster )]
public Rectangle2D Zone
{
get{ return m_Zone; }
get => m_Zone;
set
{
m_Zone = value;
@ -302,31 +322,41 @@ namespace Server.Engines.ConPVP
}
[CommandProperty( AccessLevel.GameMaster )]
public Point3D Outside{ get{ return m_Outside; } set{ m_Outside = value; } }
public Point3D Outside{ get => m_Outside;
set => m_Outside = value;
}
[CommandProperty( AccessLevel.GameMaster )]
public Point3D GateIn{ get{ return m_GateIn; } set{ m_GateIn = value; } }
public Point3D GateIn{ get => m_GateIn;
set => m_GateIn = value;
}
[CommandProperty( AccessLevel.GameMaster )]
public Point3D GateOut{ get{ return m_GateOut; } set{ m_GateOut = value; if ( m_Teleporter != null ) m_Teleporter.Location = m_GateOut; } }
public Point3D GateOut{ get => m_GateOut;
set{ m_GateOut = value; if ( m_Teleporter != null ) m_Teleporter.Location = m_GateOut; } }
[CommandProperty( AccessLevel.GameMaster )]
public Point3D Wall{ get{ return m_Wall; } set{ m_Wall = value; } }
public Point3D Wall{ get => m_Wall;
set => m_Wall = value;
}
[CommandProperty( AccessLevel.GameMaster )]
public bool IsOccupied{ get{ return ( m_Players.Count > 0 ); } }
public bool IsOccupied => ( m_Players.Count > 0 );
[CommandProperty( AccessLevel.GameMaster )]
public ArenaStartPoints Points{ get{ return m_Points; } set{} }
public ArenaStartPoints Points{ get => m_Points;
set{} }
public Item Teleporter{ get{ return m_Teleporter; } set{ m_Teleporter = value; } }
public Item Teleporter{ get => m_Teleporter;
set => m_Teleporter = value;
}
public List<Mobile> Players{ get{ return m_Players; } }
public List<Mobile> Players => m_Players;
[CommandProperty( AccessLevel.GameMaster )]
public bool Active
{
get{ return m_Active; }
get => m_Active;
set
{
if ( m_Active == value )
@ -567,7 +597,8 @@ namespace Server.Engines.ConPVP
}
[CommandProperty( AccessLevel.Administrator, AccessLevel.Administrator )]
public bool ForceEvict{ get{ return false; } set{ if ( value ) Evict(); } }
public bool ForceEvict{ get => false;
set{ if ( value ) Evict(); } }
public void Evict()
{
@ -662,7 +693,7 @@ namespace Server.Engines.ConPVP
private static List<Arena> m_Arenas = new List<Arena>();
public static List<Arena> Arenas{ get{ return m_Arenas; } }
public static List<Arena> Arenas => m_Arenas;
public static Arena FindArena( List<Mobile> players )
{
@ -765,20 +796,7 @@ namespace Server.Engines.ConPVP
public int m_VotesFor;
public int m_VotesAgainst;
public int Value
{
get
{
return m_VotesFor;
/*if ( m_VotesFor > m_VotesAgainst )
return m_VotesFor - m_VotesAgainst;
else if ( m_VotesFor > 0 )
return 1;
else
return 0;*/
}
}
public int Value => m_VotesFor;
public ArenaEntry( Arena arena )
{

5
Scripts/Engines/ConPVP/ArenaGump.cs
View file

@ -9,10 +9,7 @@ namespace Server.Engines.ConPVP
{
public class ArenasMoongate : Item
{
public override string DefaultName
{
get { return "arena moongate"; }
}
public override string DefaultName => "arena moongate";
[Constructible]
public ArenasMoongate() : base( 0x1FD4 )

48
Scripts/Engines/ConPVP/DuelContext.cs
View file

@ -34,19 +34,19 @@ namespace Server.Engines.ConPVP
private bool m_Rematch;
public bool Rematch{ get{ return m_Rematch; } }
public bool Rematch => m_Rematch;
public bool ReadyWait{ get{ return m_ReadyWait; } }
public int ReadyCount{ get{ return m_ReadyCount; } }
public bool ReadyWait => m_ReadyWait;
public int ReadyCount => m_ReadyCount;
public bool Registered{ get{ return m_Registered; } }
public bool Finished{ get{ return m_Finished; } }
public bool Started{ get{ return m_Started; } }
public bool Registered => m_Registered;
public bool Finished => m_Finished;
public bool Started => m_Started;
public Mobile Initiator{ get{ return m_Initiator; } }
public ArrayList Participants{ get{ return m_Participants; } }
public Ruleset Ruleset{ get{ return m_Ruleset; } }
public Arena Arena{ get{ return m_Arena; } }
public Mobile Initiator => m_Initiator;
public ArrayList Participants => m_Participants;
public Ruleset Ruleset => m_Ruleset;
public Arena Arena => m_Arena;
private bool CantDoAnything( Mobile mob )
{
@ -896,11 +896,13 @@ namespace Server.Engines.ConPVP
private Timer m_AutoTieTimer;
private bool m_Tied;
public bool Tied{ get{ return m_Tied; } }
public bool Tied => m_Tied;
private bool m_IsSuddenDeath;
public bool IsSuddenDeath{ get{ return m_IsSuddenDeath; } set{ m_IsSuddenDeath = value; } }
public bool IsSuddenDeath{ get => m_IsSuddenDeath;
set => m_IsSuddenDeath = value;
}
private Timer m_SDWarnTimer, m_SDActivateTimer;
@ -1664,8 +1666,8 @@ namespace Server.Engines.ConPVP
private bool m_StartedBeginCountdown;
private bool m_StartedReadyCountdown;
public bool StartedBeginCountdown{ get{ return m_StartedBeginCountdown; } }
public bool StartedReadyCountdown{ get{ return m_StartedReadyCountdown; } }
public bool StartedBeginCountdown => m_StartedBeginCountdown;
public bool StartedReadyCountdown => m_StartedReadyCountdown;
private class InternalWall : Item
{
@ -2000,9 +2002,9 @@ namespace Server.Engines.ConPVP
private Map m_Facet;
private DateTime m_Expire;
public Mobile Mobile{ get{ return m_Mobile; } }
public Point3D Location{ get{ return m_Location; } }
public Map Facet{ get{ return m_Facet; } }
public Mobile Mobile => m_Mobile;
public Point3D Location => m_Location;
public Map Facet => m_Facet;
public void Return()
{
@ -2036,7 +2038,7 @@ namespace Server.Engines.ConPVP
m_Expire = DateTime.UtcNow + TimeSpan.FromMinutes( 30.0 );
}
public bool Expired{ get{ return ( DateTime.UtcNow >= m_Expire ); } }
public bool Expired => ( DateTime.UtcNow >= m_Expire );
public void Update()
{
@ -2059,10 +2061,7 @@ namespace Server.Engines.ConPVP
{
private ArrayList m_Entries;
public override string DefaultName
{
get { return "return teleporter"; }
}
public override string DefaultName => "return teleporter";
public ExitTeleporter() : base( 0x1822 )
{
@ -2183,10 +2182,7 @@ namespace Server.Engines.ConPVP
{
private ExitTeleporter m_Teleporter;
public override string DefaultName
{
get { return "spectator moongate"; }
}
public override string DefaultName => "spectator moongate";
public ArenaMoongate( Point3D target, Map map, ExitTeleporter tp ) : base( target, map )
{

4
Scripts/Engines/ConPVP/DuelContextGump.cs
View file

@ -9,8 +9,8 @@ namespace Server.Engines.ConPVP
private Mobile m_From;
private DuelContext m_Context;
public Mobile From{ get{ return m_From; } }
public DuelContext Context{ get{ return m_Context; } }
public Mobile From => m_From;
public DuelContext Context => m_Context;
public string Center( string text )
{

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;
}

31
Scripts/Engines/ConPVP/Ladder.cs
View file

@ -8,12 +8,10 @@ namespace Server.Engines.ConPVP
private Ladder m_Ladder;
//[CommandProperty( AccessLevel.GameMaster )]
public Ladder Ladder{ get{ return m_Ladder; } set{} }
public Ladder Ladder{ get => m_Ladder;
set{} }
public override string DefaultName
{
get { return "ladder controller"; }
}
public override string DefaultName => "ladder controller";
[Constructible]
public LadderController() : base( 0x1B7A )
@ -251,7 +249,9 @@ namespace Server.Engines.ConPVP
private static Ladder m_Instance;
public static Ladder Instance{ get{ return m_Instance; } set{ m_Instance = value; } }
public static Ladder Instance{ get => m_Instance;
set => m_Instance = value;
}
public Ladder()
{
@ -322,21 +322,28 @@ namespace Server.Engines.ConPVP
private int m_Index;
private Ladder m_Ladder;
public Mobile Mobile{ get{ return m_Mobile; } }
public Mobile Mobile => m_Mobile;
[CommandProperty( AccessLevel.GameMaster, AccessLevel.Administrator )]
public int Experience{ get{ return m_Experience; } set{ m_Experience = value; m_Ladder.UpdateEntry(this); } }
public int Experience{ get => m_Experience;
set{ m_Experience = value; m_Ladder.UpdateEntry(this); } }
[CommandProperty( AccessLevel.GameMaster, AccessLevel.Administrator )]
public int Wins{ get{ return m_Wins; } set{ m_Wins = value; } }
public int Wins{ get => m_Wins;
set => m_Wins = value;
}
[CommandProperty( AccessLevel.GameMaster, AccessLevel.Administrator )]
public int Losses{ get{ return m_Losses; } set{ m_Losses = value; } }
public int Losses{ get => m_Losses;
set => m_Losses = value;
}
public int Index{ get{ return m_Index; } set{ m_Index = value; } }
public int Index{ get => m_Index;
set => m_Index = value;
}
[CommandProperty( AccessLevel.GameMaster )]
public int Rank{ get{ return m_Index; } }
public int Rank => m_Index;
public LadderEntry( Mobile mob, Ladder ladder )
{

9
Scripts/Engines/ConPVP/LadderGump.cs
View file

@ -12,14 +12,11 @@ namespace Server.Engines.ConPVP
[CommandProperty( AccessLevel.GameMaster )]
public LadderController Ladder
{
get{ return m_Ladder; }
set{ m_Ladder = value; }
get => m_Ladder;
set => m_Ladder = value;
}
public override string DefaultName
{
get { return "1v1 leaderboard"; }
}
public override string DefaultName => "1v1 leaderboard";
[Constructible]
public LadderItem() : base( 0x117F )

23
Scripts/Engines/ConPVP/Participant.cs
View file

@ -10,10 +10,12 @@ namespace Server.Engines.ConPVP
private DuelPlayer[] m_Players;
private TournyParticipant m_TournyPart;
public int Count{ get{ return m_Players.Length; } }
public DuelPlayer[] Players{ get{ return m_Players; } }
public DuelContext Context{ get{ return m_Context; } }
public TournyParticipant TournyPart{ get{ return m_TournyPart; } set{ m_TournyPart = value; } }
public int Count => m_Players.Length;
public DuelPlayer[] Players => m_Players;
public DuelContext Context => m_Context;
public TournyParticipant TournyPart{ get => m_TournyPart;
set => m_TournyPart = value;
}
public DuelPlayer Find( Mobile mob )
{
@ -215,10 +217,15 @@ namespace Server.Engines.ConPVP
private bool m_Ready;
private Participant m_Participant;
public Mobile Mobile{ get{ return m_Mobile; } }
public bool Ready{ get{ return m_Ready; } set{ m_Ready = value; } }
public bool Eliminated{ get{ return m_Eliminated; } set{ m_Eliminated = value; if ( m_Participant.Context.m_Tournament != null && m_Eliminated ){ m_Participant.Context.m_Tournament.OnEliminated( this ); m_Mobile.SendEverything(); } } }
public Participant Participant{ get{ return m_Participant; } set{ m_Participant = value; } }
public Mobile Mobile => m_Mobile;
public bool Ready{ get => m_Ready;
set => m_Ready = value;
}
public bool Eliminated{ get => m_Eliminated;
set{ m_Eliminated = value; if ( m_Participant.Context.m_Tournament != null && m_Eliminated ){ m_Participant.Context.m_Tournament.OnEliminated( this ); m_Mobile.SendEverything(); } } }
public Participant Participant{ get => m_Participant;
set => m_Participant = value;
}
public DuelPlayer( Mobile mob, Participant p )
{

6
Scripts/Engines/ConPVP/ParticipantGump.cs
View file

@ -12,9 +12,9 @@ namespace Server.Engines.ConPVP
private DuelContext m_Context;
private Participant m_Participant;
public Mobile From{ get{ return m_From; } }
public DuelContext Context{ get{ return m_Context; } }
public Participant Participant{ get{ return m_Participant; } }
public Mobile From => m_From;
public DuelContext Context => m_Context;
public Participant Participant => m_Participant;
public string Center( string text )
{

18
Scripts/Engines/ConPVP/Preferences.cs
View file

@ -11,12 +11,10 @@ namespace Server.Engines.ConPVP
private Preferences m_Preferences;
//[CommandProperty( AccessLevel.GameMaster )]
public Preferences Preferences{ get{ return m_Preferences; } set{} }
public Preferences Preferences{ get => m_Preferences;
set{} }
public override string DefaultName
{
get { return "preferences controller"; }
}
public override string DefaultName => "preferences controller";
[Constructible]
public PreferencesController() : base( 0x1B7A )
@ -74,7 +72,7 @@ namespace Server.Engines.ConPVP
private ArrayList m_Entries;
private Hashtable m_Table;
public ArrayList Entries{ get{ return m_Entries; } }
public ArrayList Entries => m_Entries;
public PreferencesEntry Find( Mobile mob )
{
@ -91,7 +89,9 @@ namespace Server.Engines.ConPVP
private static Preferences m_Instance;
public static Preferences Instance{ get{ return m_Instance; } set{ m_Instance = value; } }
public static Preferences Instance{ get => m_Instance;
set => m_Instance = value;
}
public Preferences()
{
@ -145,8 +145,8 @@ namespace Server.Engines.ConPVP
private ArrayList m_Disliked;
private Preferences m_Preferences;
public Mobile Mobile{ get{ return m_Mobile; } }
public ArrayList Disliked{ get{ return m_Disliked; } }
public Mobile Mobile => m_Mobile;
public ArrayList Disliked => m_Disliked;
public PreferencesEntry( Mobile mob, Preferences prefs )
{

16
Scripts/Engines/ConPVP/Ruleset.cs
View file

@ -12,13 +12,17 @@ namespace Server.Engines.ConPVP
private ArrayList m_Flavors = new ArrayList();
private bool m_Changed;
public RulesetLayout Layout{ get{ return m_Layout; } }
public BitArray Options{ get{ return m_Options; } }
public string Title{ get{ return m_Title; } set{ m_Title = value; } }
public RulesetLayout Layout => m_Layout;
public BitArray Options => m_Options;
public string Title{ get => m_Title;
set => m_Title = value;
}
public Ruleset Base{ get{ return m_Base; } }
public ArrayList Flavors{ get{ return m_Flavors; } }
public bool Changed{ get{ return m_Changed; } set{ m_Changed = value; } }
public Ruleset Base => m_Base;
public ArrayList Flavors => m_Flavors;
public bool Changed{ get => m_Changed;
set => m_Changed = value;
}
public void ApplyDefault( Ruleset newDefault )
{

22
Scripts/Engines/ConPVP/RulesetLayout.cs
View file

@ -660,18 +660,22 @@ namespace Server.Engines.ConPVP
private RulesetLayout m_Parent;
private RulesetLayout[] m_Children;
public string Title{ get{ return m_Title; } }
public string Description{ get{ return m_Description; } }
public string[] Options{ get{ return m_Options; } }
public string Title => m_Title;
public string Description => m_Description;
public string[] Options => m_Options;
public int Offset{ get{ return m_Offset; } }
public int TotalLength{ get{ return m_TotalLength; } }
public int Offset => m_Offset;
public int TotalLength => m_TotalLength;
public RulesetLayout Parent{ get{ return m_Parent; } }
public RulesetLayout[] Children{ get{ return m_Children; } }
public RulesetLayout Parent => m_Parent;
public RulesetLayout[] Children => m_Children;
public Ruleset[] Defaults{ get{ return m_Defaults; } set{ m_Defaults = value; } }
public Ruleset[] Flavors{ get{ return m_Flavors; } set{ m_Flavors = value; } }
public Ruleset[] Defaults{ get => m_Defaults;
set => m_Defaults = value;
}
public Ruleset[] Flavors{ get => m_Flavors;
set => m_Flavors = value;
}
public RulesetLayout FindByTitle( string title )
{

156
Scripts/Engines/ConPVP/Tournament.cs
View file

@ -41,7 +41,9 @@ namespace Server.Engines.ConPVP
private TournamentController m_Tournament;
[CommandProperty( AccessLevel.GameMaster )]
public TournamentController Tournament{ get{ return m_Tournament; } set{ m_Tournament = value; } }
public TournamentController Tournament{ get => m_Tournament;
set => m_Tournament = value;
}
[Constructible]
public TournamentRegistrar()
@ -138,16 +140,17 @@ namespace Server.Engines.ConPVP
private Mobile m_Registrar;
[CommandProperty( AccessLevel.GameMaster )]
public TournamentController Tournament{ get{ return m_Tournament; } set{ m_Tournament = value; } }
public TournamentController Tournament{ get => m_Tournament;
set => m_Tournament = value;
}
[CommandProperty( AccessLevel.GameMaster )]
public Mobile Registrar{ get{ return m_Registrar; } set{ m_Registrar = value; } }
public override string DefaultName
{
get { return "tournament signup book"; }
public Mobile Registrar{ get => m_Registrar;
set => m_Registrar = value;
}
public override string DefaultName => "tournament signup book";
[Constructible]
public TournamentSignupItem() : base( 4029 )
{
@ -1186,7 +1189,8 @@ namespace Server.Engines.ConPVP
private Tournament m_Tournament;
[CommandProperty( AccessLevel.GameMaster )]
public Tournament Tournament{ get{ return m_Tournament; } set{} }
public Tournament Tournament{ get => m_Tournament;
set{} }
private static ArrayList m_Instances = new ArrayList();
@ -1206,10 +1210,7 @@ namespace Server.Engines.ConPVP
}
}
public override string DefaultName
{
get { return "tournament controller"; }
}
public override string DefaultName => "tournament controller";
[Constructible]
public TournamentController() : base( 0x1B7A )
@ -1360,139 +1361,132 @@ namespace Server.Engines.ConPVP
private EventController m_EventController;
public bool IsNotoRestricted { get { return ( m_TournyType != TournyType.Standard ); } }
public bool IsNotoRestricted => ( m_TournyType != TournyType.Standard );
[CommandProperty( AccessLevel.GameMaster )]
public EventController EventController
{
get { return m_EventController; }
set { m_EventController = value; }
get => m_EventController;
set => m_EventController = value;
}
[CommandProperty( AccessLevel.GameMaster )]
public int SuddenDeathRounds
{
get{ return m_SuddenDeathRounds; }
set{ m_SuddenDeathRounds = value; }
get => m_SuddenDeathRounds;
set => m_SuddenDeathRounds = value;
}
[CommandProperty( AccessLevel.GameMaster )]
public TournyType TournyType
{
get{ return m_TournyType; }
set{ m_TournyType = value; }
get => m_TournyType;
set => m_TournyType = value;
}
[CommandProperty( AccessLevel.GameMaster )]
public GroupingType GroupType
{
get{ return m_GroupType; }
set{ m_GroupType = value; }
get => m_GroupType;
set => m_GroupType = value;
}
[CommandProperty( AccessLevel.GameMaster )]
public TieType TieType
{
get{ return m_TieType; }
set{ m_TieType = value; }
get => m_TieType;
set => m_TieType = value;
}
[CommandProperty( AccessLevel.GameMaster )]
public TimeSpan SuddenDeath
{
get{ return m_SuddenDeath; }
set{ m_SuddenDeath = value; }
get => m_SuddenDeath;
set => m_SuddenDeath = value;
}
public Ruleset Ruleset
{
get{ return m_Ruleset; }
set{ m_Ruleset = value; }
get => m_Ruleset;
set => m_Ruleset = value;
}
[CommandProperty( AccessLevel.GameMaster )]
public int ParticipantsPerMatch
{
get{ return m_ParticipantsPerMatch; }
get => m_ParticipantsPerMatch;
set{ if ( value < 2 ) value = 2; else if ( value > 10 ) value = 10; m_ParticipantsPerMatch = value; }
}
[CommandProperty( AccessLevel.GameMaster )]
public int PlayersPerParticipant
{
get{ return m_PlayersPerParticipant; }
get => m_PlayersPerParticipant;
set{ if ( value < 1 ) value = 1; else if ( value > 10 ) value = 10; m_PlayersPerParticipant = value; }
}
[CommandProperty( AccessLevel.GameMaster )]
public int LevelRequirement
{
get{ return m_LevelRequirement; }
set{ m_LevelRequirement = value; }
get => m_LevelRequirement;
set => m_LevelRequirement = value;
}
[CommandProperty( AccessLevel.GameMaster )]
public bool FactionRestricted
{
get{ return m_FactionRestricted; }
set{ m_FactionRestricted = value; }
get => m_FactionRestricted;
set => m_FactionRestricted = value;
}
[CommandProperty( AccessLevel.GameMaster )]
public TimeSpan SignupPeriod
{
get{ return m_SignupPeriod; }
set{ m_SignupPeriod = value; }
get => m_SignupPeriod;
set => m_SignupPeriod = value;
}
[CommandProperty( AccessLevel.GameMaster )]
public DateTime SignupStart
{
get{ return m_SignupStart; }
set{ m_SignupStart = value; }
get => m_SignupStart;
set => m_SignupStart = value;
}
[CommandProperty( AccessLevel.GameMaster )]
public TournamentStage CurrentStage
{
get{ return m_Stage; }
}
public TournamentStage CurrentStage => m_Stage;
public TournamentStage Stage
{
get{ return m_Stage; }
set{ m_Stage = value; }
get => m_Stage;
set => m_Stage = value;
}
public TournyPyramid Pyramid
{
get{ return m_Pyramid; }
set{ m_Pyramid = value; }
get => m_Pyramid;
set => m_Pyramid = value;
}
public ArrayList Arenas
{
get{ return m_Arenas; }
set{ m_Arenas = value; }
get => m_Arenas;
set => m_Arenas = value;
}
public ArrayList Participants
{
get{ return m_Participants; }
set{ m_Participants = value; }
get => m_Participants;
set => m_Participants = value;
}
public ArrayList Undefeated
{
get{ return m_Undefeated; }
set{ m_Undefeated = value; }
get => m_Undefeated;
set => m_Undefeated = value;
}
public bool IsFactionRestricted {
get {
return ( m_FactionRestricted || m_TournyType == TournyType.Faction );
}
}
public bool IsFactionRestricted => ( m_FactionRestricted || m_TournyType == TournyType.Faction );
public bool HasParticipant( Mobile mob )
{
@ -2255,8 +2249,8 @@ namespace Server.Engines.ConPVP
public ArrayList Levels
{
get{ return m_Levels; }
set{ m_Levels = value; }
get => m_Levels;
set => m_Levels = value;
}
public TournyPyramid()
@ -2443,14 +2437,14 @@ namespace Server.Engines.ConPVP
public ArrayList Matches
{
get{ return m_Matches; }
set{ m_Matches = value; }
get => m_Matches;
set => m_Matches = value;
}
public TournyParticipant FreeAdvance
{
get{ return m_FreeAdvance; }
set{ m_FreeAdvance = value; }
get => m_FreeAdvance;
set => m_FreeAdvance = value;
}
public PyramidLevel()
@ -2467,26 +2461,23 @@ namespace Server.Engines.ConPVP
public ArrayList Participants
{
get{ return m_Participants; }
set{ m_Participants = value; }
get => m_Participants;
set => m_Participants = value;
}
public TournyParticipant Winner
{
get{ return m_Winner; }
set{ m_Winner = value; }
get => m_Winner;
set => m_Winner = value;
}
public DuelContext Context
{
get{ return m_Context; }
set{ m_Context = value; }
get => m_Context;
set => m_Context = value;
}
public bool InProgress
{
get{ return ( m_Context != null && m_Context.Registered ); }
}
public bool InProgress => ( m_Context != null && m_Context.Registered );
public void Start( Arena arena, Tournament tourny )
{
@ -2601,20 +2592,20 @@ namespace Server.Engines.ConPVP
public ArrayList Players
{
get{ return m_Players; }
set{ m_Players = value; }
get => m_Players;
set => m_Players = value;
}
public ArrayList Log
{
get{ return m_Log; }
set{ m_Log = value; }
get => m_Log;
set => m_Log = value;
}
public int FreeAdvances
{
get{ return m_FreeAdvances; }
set{ m_FreeAdvances = value; }
get => m_FreeAdvances;
set => m_FreeAdvances = value;
}
public int TotalLadderXP
@ -3520,13 +3511,12 @@ namespace Server.Engines.ConPVP
private TournamentController m_Tournament;
[CommandProperty( AccessLevel.GameMaster )]
public TournamentController Tournament{ get{ return m_Tournament; } set{ m_Tournament = value; } }
public override string DefaultName
{
get { return "tournament bracket"; }
public TournamentController Tournament{ get => m_Tournament;
set => m_Tournament = value;
}
public override string DefaultName => "tournament bracket";
[Constructible]
public TournamentBracketItem() : base( 3774 )
{

13
Scripts/Engines/ConPVP/Trophy.cs
View file

@ -18,16 +18,21 @@ namespace Server.Items
private DateTime m_Date;
[CommandProperty( AccessLevel.GameMaster )]
public string Title{ get{ return m_Title; } set{ m_Title = value; } }
public string Title{ get => m_Title;
set => m_Title = value;
}
[CommandProperty( AccessLevel.GameMaster )]
public TrophyRank Rank{ get{ return m_Rank; } set{ m_Rank = value; UpdateStyle(); } }
public TrophyRank Rank{ get => m_Rank;
set{ m_Rank = value; UpdateStyle(); } }
[CommandProperty( AccessLevel.GameMaster )]
public Mobile Owner{ get{ return m_Owner; } set{ m_Owner = value; } }
public Mobile Owner{ get => m_Owner;
set => m_Owner = value;
}
[CommandProperty( AccessLevel.GameMaster )]
public DateTime Date{ get{ return m_Date; } }
public DateTime Date => m_Date;
[Constructible]
public Trophy( string title, TrophyRank rank ) : base( 5020 )