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

111
Scripts/Items/Games/Mahjong/MahjongGame.cs
View file

@ -11,29 +11,22 @@ namespace Server.Engines.Mahjong
public const int MaxPlayers = 4;
public const int BaseScore = 30000;
private MahjongTile[] m_Tiles;
private MahjongDealerIndicator m_DealerIndicator;
private MahjongWallBreakIndicator m_WallBreakIndicator;
private MahjongDices m_Dices;
private MahjongPlayers m_Players;
private bool m_ShowScores;
private bool m_SpectatorVision;
private DateTime m_LastReset;
public MahjongTile[] Tiles => m_Tiles;
public MahjongDealerIndicator DealerIndicator => m_DealerIndicator;
public MahjongWallBreakIndicator WallBreakIndicator => m_WallBreakIndicator;
public MahjongDices Dices => m_Dices;
public MahjongPlayers Players => m_Players;
public MahjongTile[] Tiles { get; private set; }
private SecureLevel m_Level;
public MahjongDealerIndicator DealerIndicator { get; private set; }
public MahjongWallBreakIndicator WallBreakIndicator { get; private set; }
public MahjongDices Dices { get; private set; }
public MahjongPlayers Players { get; private set; }
[CommandProperty( AccessLevel.GameMaster )]
public SecureLevel Level
{
get => m_Level;
set => m_Level = value;
}
public SecureLevel Level { get; set; }
[CommandProperty( AccessLevel.GameMaster )]
public bool ShowScores
@ -47,11 +40,11 @@ namespace Server.Engines.Mahjong
m_ShowScores = value;
if ( value )
m_Players.SendPlayersPacket( true, true );
Players.SendPlayersPacket( true, true );
m_Players.SendGeneralPacket( true, true );
Players.SendGeneralPacket( true, true );
m_Players.SendLocalizedMessage( value ? 1062777 : 1062778 ); // The dealer has enabled/disabled score display.
Players.SendLocalizedMessage( value ? 1062777 : 1062778 ); // The dealer has enabled/disabled score display.
}
}
@ -66,12 +59,12 @@ namespace Server.Engines.Mahjong
m_SpectatorVision = value;
if ( m_Players.IsInGamePlayer( m_Players.DealerPosition ) )
m_Players.Dealer.Send( new MahjongGeneralInfo( this ) );
if ( Players.IsInGamePlayer( Players.DealerPosition ) )
Players.Dealer.Send( new MahjongGeneralInfo( this ) );
m_Players.SendTilesPacket( false, true );
Players.SendTilesPacket( false, true );
m_Players.SendLocalizedMessage( value ? 1062715 : 1062716 ); // The dealer has enabled/disabled Spectator Vision.
Players.SendLocalizedMessage( value ? 1062715 : 1062716 ); // The dealer has enabled/disabled Spectator Vision.
InvalidateProperties();
}
@ -83,12 +76,12 @@ namespace Server.Engines.Mahjong
Weight = 5.0;
BuildWalls();
m_DealerIndicator = new MahjongDealerIndicator( this, new Point2D( 300, 300 ), MahjongPieceDirection.Up, MahjongWind.North );
m_WallBreakIndicator = new MahjongWallBreakIndicator( this, new Point2D( 335, 335 ) );
m_Dices = new MahjongDices( this );
m_Players = new MahjongPlayers( this, MaxPlayers, BaseScore );
DealerIndicator = new MahjongDealerIndicator( this, new Point2D( 300, 300 ), MahjongPieceDirection.Up, MahjongWind.North );
WallBreakIndicator = new MahjongWallBreakIndicator( this, new Point2D( 335, 335 ) );
Dices = new MahjongDices( this );
Players = new MahjongPlayers( this, MaxPlayers, BaseScore );
m_LastReset = DateTime.UtcNow;
m_Level = SecureLevel.CoOwners;
Level = SecureLevel.CoOwners;
}
public MahjongGame( Serial serial ) : base( serial )
@ -100,7 +93,7 @@ namespace Server.Engines.Mahjong
for ( int i = 0; i < 17; i++ )
{
Point2D position = new Point2D( x + i*20, y );
m_Tiles[index + i] = new MahjongTile( this, index + i, typeGenerator.Next(), position, stackLevel, direction, false );
Tiles[index + i] = new MahjongTile( this, index + i, typeGenerator.Next(), position, stackLevel, direction, false );
}
index += 17;
@ -111,7 +104,7 @@ namespace Server.Engines.Mahjong
for ( int i = 0; i < 17; i++ )
{
Point2D position = new Point2D( x, y + i*20 );
m_Tiles[index + i] = new MahjongTile( this, index + i, typeGenerator.Next(), position, stackLevel, direction, false );
Tiles[index + i] = new MahjongTile( this, index + i, typeGenerator.Next(), position, stackLevel, direction, false );
}
index += 17;
@ -119,7 +112,7 @@ namespace Server.Engines.Mahjong
private void BuildWalls()
{
m_Tiles = new MahjongTile[17 * 8];
Tiles = new MahjongTile[17 * 8];
MahjongTileTypeGenerator typeGenerator = new MahjongTileTypeGenerator( 4 );
@ -152,9 +145,9 @@ namespace Server.Engines.Mahjong
{
base.GetContextMenuEntries( from, list );
m_Players.CheckPlayers();
Players.CheckPlayers();
if ( from.Alive && IsAccessibleTo( from ) && m_Players.GetInGameMobiles( true, false ).Count == 0 )
if ( from.Alive && IsAccessibleTo( from ) && Players.GetInGameMobiles( true, false ).Count == 0 )
list.Add( new ResetGameEntry( this ) );
SetSecureLevelEntry.AddTo( from, this, list );
@ -180,9 +173,9 @@ namespace Server.Engines.Mahjong
public override void OnDoubleClick( Mobile from )
{
m_Players.CheckPlayers();
Players.CheckPlayers();
m_Players.Join( from );
Players.Join( from );
}
public void ResetGame( Mobile from )
@ -193,14 +186,14 @@ namespace Server.Engines.Mahjong
m_LastReset = DateTime.UtcNow;
if ( from != null )
m_Players.SendLocalizedMessage( 1062771, from.Name ); // ~1_name~ has reset the game.
Players.SendLocalizedMessage( 1062771, from.Name ); // ~1_name~ has reset the game.
m_Players.SendRelievePacket( true, true );
Players.SendRelievePacket( true, true );
BuildWalls();
m_DealerIndicator = new MahjongDealerIndicator( this, new Point2D( 300, 300 ), MahjongPieceDirection.Up, MahjongWind.North );
m_WallBreakIndicator = new MahjongWallBreakIndicator( this, new Point2D( 335, 335 ) );
m_Players = new MahjongPlayers( this, MaxPlayers, BaseScore );
DealerIndicator = new MahjongDealerIndicator( this, new Point2D( 300, 300 ), MahjongPieceDirection.Up, MahjongWind.North );
WallBreakIndicator = new MahjongWallBreakIndicator( this, new Point2D( 335, 335 ) );
Players = new MahjongPlayers( this, MaxPlayers, BaseScore );
}
public void ResetWalls( Mobile from )
@ -212,16 +205,16 @@ namespace Server.Engines.Mahjong
BuildWalls();
m_Players.SendTilesPacket( true, true );
Players.SendTilesPacket( true, true );
if ( from != null )
m_Players.SendLocalizedMessage( 1062696 ); // The dealer rebuilds the wall.
Players.SendLocalizedMessage( 1062696 ); // The dealer rebuilds the wall.
}
public int GetStackLevel( MahjongPieceDim dim )
{
int level = -1;
foreach ( MahjongTile tile in m_Tiles )
foreach ( MahjongTile tile in Tiles )
{
if ( tile.StackLevel > level && dim.IsOverlapping( tile.Dimensions ) )
level = tile.StackLevel;
@ -235,20 +228,20 @@ namespace Server.Engines.Mahjong
writer.Write( (int) 1 ); // version
writer.Write( (int) m_Level );
writer.Write( (int) Level );
writer.Write( m_Tiles.Length );
writer.Write( Tiles.Length );
for ( int i = 0; i < m_Tiles.Length; i++ )
m_Tiles[i].Save( writer );
for ( int i = 0; i < Tiles.Length; i++ )
Tiles[i].Save( writer );
m_DealerIndicator.Save( writer );
DealerIndicator.Save( writer );
m_WallBreakIndicator.Save( writer );
WallBreakIndicator.Save( writer );
m_Dices.Save( writer );
Dices.Save( writer );
m_Players.Save( writer );
Players.Save( writer );
writer.Write( m_ShowScores );
writer.Write( m_SpectatorVision );
@ -264,28 +257,28 @@ namespace Server.Engines.Mahjong
{
case 1:
{
m_Level = (SecureLevel)reader.ReadInt();
Level = (SecureLevel)reader.ReadInt();
goto case 0;
}
case 0:
{
if ( version < 1 )
m_Level = SecureLevel.CoOwners;
Level = SecureLevel.CoOwners;
int length = reader.ReadInt();
m_Tiles = new MahjongTile[length];
Tiles = new MahjongTile[length];
for ( int i = 0; i < length; i++ )
m_Tiles[i] = new MahjongTile( this, reader );
Tiles[i] = new MahjongTile( this, reader );
m_DealerIndicator = new MahjongDealerIndicator( this, reader );
DealerIndicator = new MahjongDealerIndicator( this, reader );
m_WallBreakIndicator = new MahjongWallBreakIndicator( this, reader );
WallBreakIndicator = new MahjongWallBreakIndicator( this, reader );
m_Dices = new MahjongDices( this, reader );
Dices = new MahjongDices( this, reader );
m_Players = new MahjongPlayers( this, reader );
Players = new MahjongPlayers( this, reader );
m_ShowScores = reader.ReadBool();
m_SpectatorVision = reader.ReadBool();