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

Upgrades code style - First batch (#22)

Browse source
This commit is contained in:
Kamron Batman 2018-08-14 06:16:50 +08:00 • committed by GitHub
parent 8ee42c8ea2
commit 632e8b4757
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1834 changed files with 10245 additions and 10437 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -2437,7 +2437,7 @@ namespace Server.Engines.ConPVP
public TournyMatch m_Match;
public EventGame m_EventGame;
public Tournament Tournament { get { return m_Tournament; } }
public Tournament Tournament => m_Tournament;
public void SendReadyGump( int count )
{
@ -2491,7 +2491,7 @@ namespace Server.Engines.ConPVP
}
Arena arena = m_OverrideArena;
if ( arena == null )
arena = Arena.FindArena( players );
@ -2701,4 +2701,4 @@ namespace Server.Engines.ConPVP
}
}*/
}
}
}

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

@ -705,7 +705,7 @@ namespace Server.Engines.ConPVP
}
}
public Mobile Thrower { get { return m_Thrower; } }
public Mobile Thrower => m_Thrower;
public bool CheckScore( BRGoal goal, Mobile m, int points )
{
@ -1178,7 +1178,7 @@ namespace Server.Engines.ConPVP
private int m_Score;
public Mobile Player { get { return m_Player; } }
public Mobile Player => m_Player;
public int CompareTo( object obj )
{
@ -1287,7 +1287,7 @@ namespace Server.Engines.ConPVP
}
public BRGame Game { get { return m_Game; } set { m_Game = value; } }
public int TeamID { get { return m_TeamID; } }
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; } }
@ -1426,7 +1426,7 @@ namespace Server.Engines.ConPVP
private TimeSpan m_Duration;
private Point3D m_BombHome;
public BRTeamInfo[] TeamInfo { get { return m_TeamInfo; } }
public BRTeamInfo[] TeamInfo => m_TeamInfo;
[CommandProperty( AccessLevel.GameMaster )]
public BRTeamInfo Team1 { get { return m_TeamInfo[0]; } set { } }
@ -1571,7 +1571,7 @@ namespace Server.Engines.ConPVP
private BRController m_Controller;
public BRController Controller { get { return m_Controller; } }
public BRController Controller => m_Controller;
public void Alert( string text )
{

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

@ -401,7 +401,7 @@ namespace Server.Engines.ConPVP
{
if ( m_TeamInfo == null )
return;
if ( !IsChildOf( from.Backpack ) )
return;
@ -549,7 +549,7 @@ namespace Server.Engines.ConPVP
private int m_Score;
public Mobile Player { get { return m_Player; } }
public Mobile Player => m_Player;
string IRankedCTF.Name
{
@ -632,7 +632,7 @@ namespace Server.Engines.ConPVP
}
public CTFGame Game { get { return m_Game; } set { m_Game = value; } }
public int TeamID { get { return m_TeamID; } }
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; } }
@ -666,9 +666,7 @@ namespace Server.Engines.ConPVP
if ( mob == null )
return null;
CTFPlayerInfo val;
if ( !m_Players.TryGetValue( mob, out val ) )
if (!m_Players.TryGetValue( mob, out CTFPlayerInfo val ))
m_Players[mob] = val = new CTFPlayerInfo( this, mob );
return val;
@ -789,7 +787,7 @@ namespace Server.Engines.ConPVP
private TimeSpan m_Duration;
public CTFTeamInfo[] TeamInfo { get { return m_TeamInfo; } }
public CTFTeamInfo[] TeamInfo => m_TeamInfo;
[CommandProperty( AccessLevel.GameMaster )]
public CTFTeamInfo Team1 { get { return m_TeamInfo[0]; } set { } }
@ -919,7 +917,7 @@ namespace Server.Engines.ConPVP
private CTFController m_Controller;
public CTFController Controller { get { return m_Controller; } }
public CTFController Controller => m_Controller;
public void Alert( string text )
{
@ -1329,4 +1327,4 @@ namespace Server.Engines.ConPVP
m_FinishTimer = null;
}
}
}
}

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

@ -240,7 +240,7 @@ namespace Server.Engines.ConPVP
private int m_Score;
public Mobile Player { get { return m_Player; } }
public Mobile Player => m_Player;
public string Name
{
@ -322,7 +322,7 @@ namespace Server.Engines.ConPVP
}
public DDGame Game { get { return m_Game; } set { m_Game = value; } }
public int TeamID { get { return m_TeamID; } }
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; } }
@ -356,9 +356,7 @@ namespace Server.Engines.ConPVP
if ( mob == null )
return null;
DDPlayerInfo val;
if ( !m_Players.TryGetValue( mob, out val ) )
if (!m_Players.TryGetValue( mob, out DDPlayerInfo val ))
m_Players[mob] = val = new DDPlayerInfo( this, mob );
return val;
@ -449,7 +447,7 @@ namespace Server.Engines.ConPVP
private TimeSpan m_Duration;
public DDTeamInfo[] TeamInfo { get { return m_TeamInfo; } }
public DDTeamInfo[] TeamInfo => m_TeamInfo;
[CommandProperty( AccessLevel.GameMaster )]
public DDTeamInfo Team1 { get { return m_TeamInfo[0]; } set { } }
@ -487,7 +485,7 @@ namespace Server.Engines.ConPVP
return new DDGame( this, context );
}
public override string DefaultName { get { return "DD Controller"; } }
public override string DefaultName => "DD Controller";
[Constructible]
public DDController()
@ -554,7 +552,7 @@ namespace Server.Engines.ConPVP
{
private DDController m_Controller;
public DDController Controller { get { return m_Controller; } }
public DDController Controller => m_Controller;
public void Alert( string text )
{

6
Scripts/Engines/ConPVP/Games/EventGame.cs
View file

@ -51,9 +51,9 @@ namespace Server.Engines.ConPVP
{
protected DuelContext m_Context;
public DuelContext Context { get { return m_Context; } }
public DuelContext Context => m_Context;
public virtual bool FreeConsume { get { return true; } }
public virtual bool FreeConsume => true;
public EventGame( DuelContext context )
{
@ -78,4 +78,4 @@ namespace Server.Engines.ConPVP
{
}
}
}
}

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

@ -210,7 +210,7 @@ namespace Server.Engines.ConPVP
private int m_Total;
private int m_Counter;
public int Captures { get { return m_Total; } }
public int Captures => m_Total;
public KingTimer(HillOfTheKing hill)
: base(TimeSpan.FromSeconds(1.0), TimeSpan.FromSeconds(1.0))
@ -537,7 +537,7 @@ namespace Server.Engines.ConPVP
m_Player = player;
}
public Mobile Player { get { return m_Player; } }
public Mobile Player => m_Player;
public int CompareTo(object obj)
{
@ -647,7 +647,7 @@ namespace Server.Engines.ConPVP
}
public KHGame Game { get { return m_Game; } set { m_Game = value; } }
public int TeamID { get { return m_TeamID; } }
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; } }
@ -756,7 +756,7 @@ namespace Server.Engines.ConPVP
private TimeSpan m_Duration;
private int m_ScoreInterval;
public KHTeamInfo[] TeamInfo { get { return m_TeamInfo; } }
public KHTeamInfo[] TeamInfo => m_TeamInfo;
[CommandProperty(AccessLevel.GameMaster)]
public KHTeamInfo Team1_W { get { return m_TeamInfo[0]; } set { } }
@ -782,7 +782,7 @@ namespace Server.Engines.ConPVP
[CommandProperty(AccessLevel.GameMaster)]
public KHTeamInfo Team8_NE { get { return m_TeamInfo[7]; } set { } }
public HillOfTheKing[] Hills { get { return m_Hills; } }
public HillOfTheKing[] Hills => m_Hills;
[CommandProperty(AccessLevel.GameMaster)]
public HillOfTheKing Hill1 { get { return m_Hills[0]; } set { m_Hills[0] = value; } }
@ -796,7 +796,7 @@ namespace Server.Engines.ConPVP
[CommandProperty(AccessLevel.GameMaster)]
public HillOfTheKing Hill4 { get { return m_Hills[3]; } set { m_Hills[3] = value; } }
public ArrayList Boards { get { return m_Boards; } }
public ArrayList Boards => m_Boards;
[CommandProperty(AccessLevel.GameMaster)]
public TimeSpan Duration
@ -911,7 +911,7 @@ namespace Server.Engines.ConPVP
{
private KHController m_Controller;
public KHController Controller { get { return m_Controller; } }
public KHController Controller => m_Controller;
public override bool CantDoAnything(Mobile mob)
{