Fixes code according to modern code style. Fixes a few expression bugs.
This commit is contained in:
Kamron Batman
parent
89eea25e5f
commit
970fd563b2
3324 changed files with 441118 additions and 433755 deletions
|
|
@ -2,239 +2,232 @@ using Server.Network;
|
|||
|
||||
namespace Server.Engines.Mahjong
|
||||
{
|
||||
public delegate void OnMahjongPacketReceive( MahjongGame game, NetState state, PacketReader pvSrc );
|
||||
public delegate void OnMahjongPacketReceive(MahjongGame game, NetState state, PacketReader pvSrc);
|
||||
|
||||
public sealed class MahjongPacketHandlers
|
||||
{
|
||||
private static OnMahjongPacketReceive[] m_SubCommandDelegates = new OnMahjongPacketReceive[0x100];
|
||||
public sealed class MahjongPacketHandlers
|
||||
{
|
||||
private static OnMahjongPacketReceive[] m_SubCommandDelegates = new OnMahjongPacketReceive[0x100];
|
||||
|
||||
public static void RegisterSubCommand( int subCmd, OnMahjongPacketReceive onReceive )
|
||||
{
|
||||
m_SubCommandDelegates[subCmd] = onReceive;
|
||||
}
|
||||
public static void RegisterSubCommand(int subCmd, OnMahjongPacketReceive onReceive)
|
||||
{
|
||||
m_SubCommandDelegates[subCmd] = onReceive;
|
||||
}
|
||||
|
||||
public static OnMahjongPacketReceive GetSubCommandDelegate( int cmd )
|
||||
{
|
||||
if ( cmd >= 0 && cmd < 0x100 )
|
||||
{
|
||||
return m_SubCommandDelegates[cmd];
|
||||
}
|
||||
public static OnMahjongPacketReceive GetSubCommandDelegate(int cmd)
|
||||
{
|
||||
if (cmd >= 0 && cmd < 0x100) return m_SubCommandDelegates[cmd];
|
||||
|
||||
return null;
|
||||
}
|
||||
return null;
|
||||
}
|
||||
|
||||
public static void Initialize()
|
||||
{
|
||||
PacketHandlers.Register( 0xDA, 0, true, OnPacket );
|
||||
public static void Initialize()
|
||||
{
|
||||
PacketHandlers.Register(0xDA, 0, true, OnPacket);
|
||||
|
||||
RegisterSubCommand( 0x6, ExitGame );
|
||||
RegisterSubCommand( 0xA, GivePoints );
|
||||
RegisterSubCommand( 0xB, RollDice );
|
||||
RegisterSubCommand( 0xC, BuildWalls );
|
||||
RegisterSubCommand( 0xD, ResetScores );
|
||||
RegisterSubCommand( 0xF, AssignDealer );
|
||||
RegisterSubCommand( 0x10, OpenSeat );
|
||||
RegisterSubCommand( 0x11, ChangeOption );
|
||||
RegisterSubCommand( 0x15, MoveWallBreakIndicator );
|
||||
RegisterSubCommand( 0x16, TogglePublicHand );
|
||||
RegisterSubCommand( 0x17, MoveTile );
|
||||
RegisterSubCommand( 0x18, MoveDealerIndicator );
|
||||
}
|
||||
RegisterSubCommand(0x6, ExitGame);
|
||||
RegisterSubCommand(0xA, GivePoints);
|
||||
RegisterSubCommand(0xB, RollDice);
|
||||
RegisterSubCommand(0xC, BuildWalls);
|
||||
RegisterSubCommand(0xD, ResetScores);
|
||||
RegisterSubCommand(0xF, AssignDealer);
|
||||
RegisterSubCommand(0x10, OpenSeat);
|
||||
RegisterSubCommand(0x11, ChangeOption);
|
||||
RegisterSubCommand(0x15, MoveWallBreakIndicator);
|
||||
RegisterSubCommand(0x16, TogglePublicHand);
|
||||
RegisterSubCommand(0x17, MoveTile);
|
||||
RegisterSubCommand(0x18, MoveDealerIndicator);
|
||||
}
|
||||
|
||||
public static void OnPacket( NetState state, PacketReader pvSrc )
|
||||
{
|
||||
MahjongGame game = World.FindItem( pvSrc.ReadInt32() ) as MahjongGame;
|
||||
public static void OnPacket(NetState state, PacketReader pvSrc)
|
||||
{
|
||||
MahjongGame game = World.FindItem(pvSrc.ReadInt32()) as MahjongGame;
|
||||
|
||||
game?.Players.CheckPlayers();
|
||||
game?.Players.CheckPlayers();
|
||||
|
||||
pvSrc.ReadByte();
|
||||
pvSrc.ReadByte();
|
||||
|
||||
int cmd = pvSrc.ReadByte();
|
||||
int cmd = pvSrc.ReadByte();
|
||||
|
||||
OnMahjongPacketReceive onReceive = GetSubCommandDelegate( cmd );
|
||||
OnMahjongPacketReceive onReceive = GetSubCommandDelegate(cmd);
|
||||
|
||||
if ( onReceive != null )
|
||||
{
|
||||
onReceive( game, state, pvSrc );
|
||||
}
|
||||
else
|
||||
{
|
||||
pvSrc.Trace( state );
|
||||
}
|
||||
}
|
||||
if (onReceive != null)
|
||||
onReceive(game, state, pvSrc);
|
||||
else
|
||||
pvSrc.Trace(state);
|
||||
}
|
||||
|
||||
private static MahjongPieceDirection GetDirection( int value )
|
||||
{
|
||||
switch ( value )
|
||||
{
|
||||
case 0: return MahjongPieceDirection.Up;
|
||||
case 1: return MahjongPieceDirection.Left;
|
||||
case 2: return MahjongPieceDirection.Down;
|
||||
default: return MahjongPieceDirection.Right;
|
||||
}
|
||||
}
|
||||
private static MahjongPieceDirection GetDirection(int value)
|
||||
{
|
||||
switch (value)
|
||||
{
|
||||
case 0: return MahjongPieceDirection.Up;
|
||||
case 1: return MahjongPieceDirection.Left;
|
||||
case 2: return MahjongPieceDirection.Down;
|
||||
default: return MahjongPieceDirection.Right;
|
||||
}
|
||||
}
|
||||
|
||||
private static MahjongWind GetWind( int value )
|
||||
{
|
||||
switch ( value )
|
||||
{
|
||||
case 0: return MahjongWind.North;
|
||||
case 1: return MahjongWind.East;
|
||||
case 2: return MahjongWind.South;
|
||||
default: return MahjongWind.West;
|
||||
}
|
||||
}
|
||||
private static MahjongWind GetWind(int value)
|
||||
{
|
||||
switch (value)
|
||||
{
|
||||
case 0: return MahjongWind.North;
|
||||
case 1: return MahjongWind.East;
|
||||
case 2: return MahjongWind.South;
|
||||
default: return MahjongWind.West;
|
||||
}
|
||||
}
|
||||
|
||||
public static void ExitGame( MahjongGame game, NetState state, PacketReader pvSrc )
|
||||
{
|
||||
if ( game == null )
|
||||
return;
|
||||
public static void ExitGame(MahjongGame game, NetState state, PacketReader pvSrc)
|
||||
{
|
||||
if (game == null)
|
||||
return;
|
||||
|
||||
Mobile from = state.Mobile;
|
||||
Mobile from = state.Mobile;
|
||||
|
||||
game.Players.LeaveGame( from );
|
||||
}
|
||||
game.Players.LeaveGame(from);
|
||||
}
|
||||
|
||||
public static void GivePoints( MahjongGame game, NetState state, PacketReader pvSrc )
|
||||
{
|
||||
if ( game == null || !game.Players.IsInGamePlayer( state.Mobile ) )
|
||||
return;
|
||||
public static void GivePoints(MahjongGame game, NetState state, PacketReader pvSrc)
|
||||
{
|
||||
if (game == null || !game.Players.IsInGamePlayer(state.Mobile))
|
||||
return;
|
||||
|
||||
int to = pvSrc.ReadByte();
|
||||
int amount = pvSrc.ReadInt32();
|
||||
int to = pvSrc.ReadByte();
|
||||
int amount = pvSrc.ReadInt32();
|
||||
|
||||
game.Players.TransferScore( state.Mobile, to, amount );
|
||||
}
|
||||
game.Players.TransferScore(state.Mobile, to, amount);
|
||||
}
|
||||
|
||||
public static void RollDice( MahjongGame game, NetState state, PacketReader pvSrc )
|
||||
{
|
||||
if ( game == null || !game.Players.IsInGamePlayer( state.Mobile ) )
|
||||
return;
|
||||
public static void RollDice(MahjongGame game, NetState state, PacketReader pvSrc)
|
||||
{
|
||||
if (game == null || !game.Players.IsInGamePlayer(state.Mobile))
|
||||
return;
|
||||
|
||||
game.Dices.RollDices( state.Mobile );
|
||||
}
|
||||
game.Dices.RollDices(state.Mobile);
|
||||
}
|
||||
|
||||
public static void BuildWalls( MahjongGame game, NetState state, PacketReader pvSrc )
|
||||
{
|
||||
if ( game == null || !game.Players.IsInGameDealer( state.Mobile ) )
|
||||
return;
|
||||
public static void BuildWalls(MahjongGame game, NetState state, PacketReader pvSrc)
|
||||
{
|
||||
if (game == null || !game.Players.IsInGameDealer(state.Mobile))
|
||||
return;
|
||||
|
||||
game.ResetWalls( state.Mobile );
|
||||
}
|
||||
game.ResetWalls(state.Mobile);
|
||||
}
|
||||
|
||||
public static void ResetScores( MahjongGame game, NetState state, PacketReader pvSrc )
|
||||
{
|
||||
if ( game == null || !game.Players.IsInGameDealer( state.Mobile ) )
|
||||
return;
|
||||
public static void ResetScores(MahjongGame game, NetState state, PacketReader pvSrc)
|
||||
{
|
||||
if (game == null || !game.Players.IsInGameDealer(state.Mobile))
|
||||
return;
|
||||
|
||||
game.Players.ResetScores( MahjongGame.BaseScore );
|
||||
}
|
||||
game.Players.ResetScores(MahjongGame.BaseScore);
|
||||
}
|
||||
|
||||
public static void AssignDealer( MahjongGame game, NetState state, PacketReader pvSrc )
|
||||
{
|
||||
if ( game == null || !game.Players.IsInGameDealer( state.Mobile ) )
|
||||
return;
|
||||
public static void AssignDealer(MahjongGame game, NetState state, PacketReader pvSrc)
|
||||
{
|
||||
if (game == null || !game.Players.IsInGameDealer(state.Mobile))
|
||||
return;
|
||||
|
||||
int position = pvSrc.ReadByte();
|
||||
int position = pvSrc.ReadByte();
|
||||
|
||||
game.Players.AssignDealer( position );
|
||||
}
|
||||
game.Players.AssignDealer(position);
|
||||
}
|
||||
|
||||
public static void OpenSeat( MahjongGame game, NetState state, PacketReader pvSrc )
|
||||
{
|
||||
if ( game == null || !game.Players.IsInGameDealer( state.Mobile ) )
|
||||
return;
|
||||
public static void OpenSeat(MahjongGame game, NetState state, PacketReader pvSrc)
|
||||
{
|
||||
if (game == null || !game.Players.IsInGameDealer(state.Mobile))
|
||||
return;
|
||||
|
||||
int position = pvSrc.ReadByte();
|
||||
int position = pvSrc.ReadByte();
|
||||
|
||||
if ( game.Players.GetPlayer( position ) == state.Mobile )
|
||||
return;
|
||||
if (game.Players.GetPlayer(position) == state.Mobile)
|
||||
return;
|
||||
|
||||
game.Players.OpenSeat( position );
|
||||
}
|
||||
game.Players.OpenSeat(position);
|
||||
}
|
||||
|
||||
public static void ChangeOption( MahjongGame game, NetState state, PacketReader pvSrc )
|
||||
{
|
||||
if ( game == null || !game.Players.IsInGameDealer( state.Mobile ) )
|
||||
return;
|
||||
public static void ChangeOption(MahjongGame game, NetState state, PacketReader pvSrc)
|
||||
{
|
||||
if (game == null || !game.Players.IsInGameDealer(state.Mobile))
|
||||
return;
|
||||
|
||||
pvSrc.ReadInt16();
|
||||
pvSrc.ReadByte();
|
||||
pvSrc.ReadInt16();
|
||||
pvSrc.ReadByte();
|
||||
|
||||
int options = pvSrc.ReadByte();
|
||||
int options = pvSrc.ReadByte();
|
||||
|
||||
game.ShowScores = (options & 0x1) != 0;
|
||||
game.SpectatorVision = (options & 0x2) != 0;
|
||||
}
|
||||
game.ShowScores = (options & 0x1) != 0;
|
||||
game.SpectatorVision = (options & 0x2) != 0;
|
||||
}
|
||||
|
||||
public static void MoveWallBreakIndicator( MahjongGame game, NetState state, PacketReader pvSrc )
|
||||
{
|
||||
if ( game == null || !game.Players.IsInGameDealer( state.Mobile ) )
|
||||
return;
|
||||
public static void MoveWallBreakIndicator(MahjongGame game, NetState state, PacketReader pvSrc)
|
||||
{
|
||||
if (game == null || !game.Players.IsInGameDealer(state.Mobile))
|
||||
return;
|
||||
|
||||
int y = pvSrc.ReadInt16();
|
||||
int x = pvSrc.ReadInt16();
|
||||
int y = pvSrc.ReadInt16();
|
||||
int x = pvSrc.ReadInt16();
|
||||
|
||||
game.WallBreakIndicator.Move( new Point2D( x, y ) );
|
||||
}
|
||||
game.WallBreakIndicator.Move(new Point2D(x, y));
|
||||
}
|
||||
|
||||
public static void TogglePublicHand( MahjongGame game, NetState state, PacketReader pvSrc )
|
||||
{
|
||||
if ( game == null || !game.Players.IsInGamePlayer( state.Mobile ) )
|
||||
return;
|
||||
public static void TogglePublicHand(MahjongGame game, NetState state, PacketReader pvSrc)
|
||||
{
|
||||
if (game == null || !game.Players.IsInGamePlayer(state.Mobile))
|
||||
return;
|
||||
|
||||
pvSrc.ReadInt16();
|
||||
pvSrc.ReadByte();
|
||||
pvSrc.ReadInt16();
|
||||
pvSrc.ReadByte();
|
||||
|
||||
bool publicHand = pvSrc.ReadBoolean();
|
||||
bool publicHand = pvSrc.ReadBoolean();
|
||||
|
||||
game.Players.SetPublic( game.Players.GetPlayerIndex( state.Mobile ), publicHand );
|
||||
}
|
||||
game.Players.SetPublic(game.Players.GetPlayerIndex(state.Mobile), publicHand);
|
||||
}
|
||||
|
||||
public static void MoveTile( MahjongGame game, NetState state, PacketReader pvSrc )
|
||||
{
|
||||
if ( game == null || !game.Players.IsInGamePlayer( state.Mobile ) )
|
||||
return;
|
||||
public static void MoveTile(MahjongGame game, NetState state, PacketReader pvSrc)
|
||||
{
|
||||
if (game == null || !game.Players.IsInGamePlayer(state.Mobile))
|
||||
return;
|
||||
|
||||
int number = pvSrc.ReadByte();
|
||||
int number = pvSrc.ReadByte();
|
||||
|
||||
if ( number < 0 || number >= game.Tiles.Length )
|
||||
return;
|
||||
if (number < 0 || number >= game.Tiles.Length)
|
||||
return;
|
||||
|
||||
pvSrc.ReadByte(); // Current direction
|
||||
pvSrc.ReadByte(); // Current direction
|
||||
|
||||
MahjongPieceDirection direction = GetDirection( pvSrc.ReadByte() );
|
||||
MahjongPieceDirection direction = GetDirection(pvSrc.ReadByte());
|
||||
|
||||
pvSrc.ReadByte();
|
||||
pvSrc.ReadByte();
|
||||
|
||||
bool flip = pvSrc.ReadBoolean();
|
||||
bool flip = pvSrc.ReadBoolean();
|
||||
|
||||
pvSrc.ReadInt16(); // Current Y
|
||||
pvSrc.ReadInt16(); // Current X
|
||||
pvSrc.ReadInt16(); // Current Y
|
||||
pvSrc.ReadInt16(); // Current X
|
||||
|
||||
pvSrc.ReadByte();
|
||||
pvSrc.ReadByte();
|
||||
|
||||
int y = pvSrc.ReadInt16();
|
||||
int x = pvSrc.ReadInt16();
|
||||
int y = pvSrc.ReadInt16();
|
||||
int x = pvSrc.ReadInt16();
|
||||
|
||||
pvSrc.ReadByte();
|
||||
pvSrc.ReadByte();
|
||||
|
||||
game.Tiles[number].Move( new Point2D( x, y ), direction, flip, game.Players.GetPlayerIndex( state.Mobile ) );
|
||||
}
|
||||
game.Tiles[number].Move(new Point2D(x, y), direction, flip, game.Players.GetPlayerIndex(state.Mobile));
|
||||
}
|
||||
|
||||
public static void MoveDealerIndicator( MahjongGame game, NetState state, PacketReader pvSrc )
|
||||
{
|
||||
if ( game == null || !game.Players.IsInGameDealer( state.Mobile ) )
|
||||
return;
|
||||
public static void MoveDealerIndicator(MahjongGame game, NetState state, PacketReader pvSrc)
|
||||
{
|
||||
if (game == null || !game.Players.IsInGameDealer(state.Mobile))
|
||||
return;
|
||||
|
||||
MahjongPieceDirection direction = GetDirection( pvSrc.ReadByte() );
|
||||
MahjongPieceDirection direction = GetDirection(pvSrc.ReadByte());
|
||||
|
||||
MahjongWind wind = GetWind( pvSrc.ReadByte() );
|
||||
MahjongWind wind = GetWind(pvSrc.ReadByte());
|
||||
|
||||
int y = pvSrc.ReadInt16();
|
||||
int x = pvSrc.ReadInt16();
|
||||
int y = pvSrc.ReadInt16();
|
||||
int x = pvSrc.ReadInt16();
|
||||
|
||||
game.DealerIndicator.Move( new Point2D( x, y ), direction, wind );
|
||||
}
|
||||
}
|
||||
game.DealerIndicator.Move(new Point2D(x, y), direction, wind);
|
||||
}
|
||||
}
|
||||
}
|
||||
Loading…
Add table
Add a link
Reference in a new issue