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

Changes properties to use automatic property initializers

Browse source
This commit is contained in:
Kamron Batman 2018-09-14 15:23:29 -07:00
parent f0a48ad431
commit 06fa31a7bf
623 changed files with 13072 additions and 19304 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -6,31 +6,27 @@ namespace Server.Engines.ConPVP
{
public class Participant
{
private DuelContext m_Context;
private DuelPlayer[] m_Players;
private TournyParticipant m_TournyPart;
public int Count => Players.Length;
public DuelPlayer[] Players { get; private set; }
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 DuelContext Context { get; }
public TournyParticipant TournyPart { get; set; }
public DuelPlayer Find( Mobile mob )
{
if ( mob is PlayerMobile pm )
{
if ( pm.DuelContext == m_Context && pm.DuelPlayer.Participant == this )
if ( pm.DuelContext == Context && pm.DuelPlayer.Participant == this )
return pm.DuelPlayer;
return null;
}
for ( int i = 0; i < m_Players.Length; ++i )
for ( int i = 0; i < Players.Length; ++i )
{
if ( m_Players[i] != null && m_Players[i].Mobile == mob )
return m_Players[i];
if ( Players[i] != null && Players[i].Mobile == mob )
return Players[i];
}
return null;
@ -43,18 +39,18 @@ namespace Server.Engines.ConPVP
public void Broadcast( int hue, string message, string nonLocalOverhead, string localOverhead )
{
for ( int i = 0; i < m_Players.Length; ++i )
for ( int i = 0; i < Players.Length; ++i )
{
if ( m_Players[i] != null )
if ( Players[i] != null )
{
if ( message != null )
m_Players[i].Mobile.SendMessage( hue, message );
Players[i].Mobile.SendMessage( hue, message );
if ( nonLocalOverhead != null )
m_Players[i].Mobile.NonlocalOverheadMessage( Network.MessageType.Regular, hue, false, string.Format( nonLocalOverhead, m_Players[i].Mobile.Name, m_Players[i].Mobile.Female ? "her" : "his" ) );
Players[i].Mobile.NonlocalOverheadMessage( Network.MessageType.Regular, hue, false, string.Format( nonLocalOverhead, Players[i].Mobile.Name, Players[i].Mobile.Female ? "her" : "his" ) );
if ( localOverhead != null )
m_Players[i].Mobile.LocalOverheadMessage( Network.MessageType.Regular, hue, false, localOverhead );
Players[i].Mobile.LocalOverheadMessage( Network.MessageType.Regular, hue, false, localOverhead );
}
}
}
@ -65,9 +61,9 @@ namespace Server.Engines.ConPVP
{
int count = 0;
for ( int i = 0; i < m_Players.Length; ++i )
for ( int i = 0; i < Players.Length; ++i )
{
if ( m_Players[i] != null )
if ( Players[i] != null )
++count;
}
@ -79,9 +75,9 @@ namespace Server.Engines.ConPVP
{
get
{
for ( int i = 0; i < m_Players.Length; ++i )
for ( int i = 0; i < Players.Length; ++i )
{
if ( m_Players[i] == null )
if ( Players[i] == null )
return true;
}
@ -93,9 +89,9 @@ namespace Server.Engines.ConPVP
{
get
{
for ( int i = 0; i < m_Players.Length; ++i )
for ( int i = 0; i < Players.Length; ++i )
{
if ( m_Players[i] != null && !m_Players[i].Eliminated )
if ( Players[i] != null && !Players[i].Eliminated )
return false;
}
@ -109,12 +105,12 @@ namespace Server.Engines.ConPVP
{
StringBuilder sb = new StringBuilder();
for ( int i = 0; i < m_Players.Length; ++i )
for ( int i = 0; i < Players.Length; ++i )
{
if ( m_Players[i] == null )
if ( Players[i] == null )
continue;
Mobile mob = m_Players[i].Mobile;
Mobile mob = Players[i].Mobile;
if ( sb.Length > 0 )
sb.Append( ", " );
@ -134,12 +130,12 @@ namespace Server.Engines.ConPVP
if ( player == null )
return;
int index = Array.IndexOf( m_Players, player );
int index = Array.IndexOf( Players, player );
if ( index == -1 )
return;
m_Players[index] = null;
Players[index] = null;
}
public void Remove( DuelPlayer player )
@ -147,19 +143,19 @@ namespace Server.Engines.ConPVP
if ( player == null )
return;
int index = Array.IndexOf( m_Players, player );
int index = Array.IndexOf( Players, player );
if ( index == -1 )
return;
DuelPlayer[] old = m_Players;
m_Players = new DuelPlayer[old.Length - 1];
DuelPlayer[] old = Players;
Players = new DuelPlayer[old.Length - 1];
for ( int i = 0; i < index; ++i )
m_Players[i] = old[i];
Players[i] = old[i];
for ( int i = index + 1; i < old.Length; ++i )
m_Players[i - 1] = old[i];
Players[i - 1] = old[i];
}
public void Remove( Mobile player )
@ -172,23 +168,23 @@ namespace Server.Engines.ConPVP
if ( Contains( player ) )
return;
for ( int i = 0; i < m_Players.Length; ++i )
for ( int i = 0; i < Players.Length; ++i )
{
if ( m_Players[i] == null )
if ( Players[i] == null )
{
m_Players[i] = new DuelPlayer( player, this );
Players[i] = new DuelPlayer( player, this );
return;
}
}
Resize( m_Players.Length + 1 );
m_Players[m_Players.Length - 1] = new DuelPlayer( player, this );
Resize( Players.Length + 1 );
Players[Players.Length - 1] = new DuelPlayer( player, this );
}
public void Resize( int count )
{
DuelPlayer[] old = m_Players;
m_Players = new DuelPlayer[count];
DuelPlayer[] old = Players;
Players = new DuelPlayer[count];
if ( old != null )
{
@ -197,14 +193,14 @@ namespace Server.Engines.ConPVP
for ( int i = 0; i < old.Length; ++i )
{
if ( old[i] != null && ct < count )
m_Players[ct++] = old[i];
Players[ct++] = old[i];
}
}
}
public Participant( DuelContext context, int count )
{
m_Context = context;
Context = context;
//m_Stakes = new StakesContainer( context, this );
Resize( count );
}
@ -212,25 +208,20 @@ namespace Server.Engines.ConPVP
public class DuelPlayer
{
private Mobile m_Mobile;
private bool m_Eliminated;
private bool m_Ready;
private Participant m_Participant;
public Mobile Mobile => m_Mobile;
public bool Ready{ get => m_Ready;
set => m_Ready = value;
}
public Mobile Mobile { get; }
public bool Ready { get; set; }
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;
}
set{ m_Eliminated = value; if ( Participant.Context.m_Tournament != null && m_Eliminated ){ Participant.Context.m_Tournament.OnEliminated( this ); Mobile.SendEverything(); } } }
public Participant Participant { get; set; }
public DuelPlayer( Mobile mob, Participant p )
{
m_Mobile = mob;
m_Participant = p;
Mobile = mob;
Participant = p;
if ( mob is PlayerMobile mobile )
mobile.DuelPlayer = this;