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

Revert "Updates Packets & Randomizer (#43)" (#61)

Browse source 
This reverts commit 179cb50557.
This commit is contained in:
Kamron Batman 2019-11-11 08:46:11 -08:00 • committed by GitHub
parent 179cb50557
commit c2ecc76457
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
588 changed files with 16260 additions and 10926 deletions
Download patch file Download diff file Expand all files Collapse all files

10
Projects/Scripts/Items/Games/BaseBoard.cs
View file

@ -72,13 +72,17 @@ namespace Server.Items
{
if (dropped is BasePiece piece && piece.Board == this && base.OnDragDropInto(from, dropped, point))
{
Point3D loc = GetWorldLocation();
Packet p = new PlaySound(0x127, GetWorldLocation());
p.Acquire();
if (RootParent == from)
Packets.SendPlaySound(from.NetState, 0x127, loc);
from.Send(p);
else
foreach (NetState state in GetClientsInRange(2))
Packets.SendPlaySound(state, 0x127, loc);
state.Send(p);
p.Release();
return true;
}

8
Projects/Scripts/Items/Games/Dices.cs
View file

@ -21,8 +21,10 @@ namespace Server.Items
public override void OnDoubleClick(Mobile from)
{
if (from.InRange(GetWorldLocation(), 2))
Roll(from);
if (!from.InRange(GetWorldLocation(), 2))
return;
Roll(from);
}
public void Roll(Mobile from)
@ -43,4 +45,4 @@ namespace Server.Items
int version = reader.ReadInt();
}
}
}
}

4
Projects/Scripts/Items/Games/Mahjong/MahjongGame.cs
View file

@ -76,7 +76,7 @@ namespace Server.Engines.Mahjong
m_SpectatorVision = value;
if (Players.IsInGamePlayer(Players.DealerPosition))
MahjongPackets.SendMahjongGeneralInfo(Players.Dealer.NetState, this);
Players.Dealer.Send(new MahjongGeneralInfo(this));
Players.SendTilesPacket(false, true);
@ -292,4 +292,4 @@ namespace Server.Engines.Mahjong
}
}
}
}
}

11
Projects/Scripts/Items/Games/Mahjong/MahjongPacketHandlers.cs
View file

@ -6,7 +6,7 @@ namespace Server.Engines.Mahjong
public sealed class MahjongPacketHandlers
{
private static readonly OnMahjongPacketReceive[] m_SubCommandDelegates = new OnMahjongPacketReceive[0x100];
private static OnMahjongPacketReceive[] m_SubCommandDelegates = new OnMahjongPacketReceive[0x100];
public static void RegisterSubCommand(int subCmd, OnMahjongPacketReceive onReceive)
{
@ -80,7 +80,12 @@ namespace Server.Engines.Mahjong
public static void ExitGame(MahjongGame game, NetState state, PacketReader pvSrc)
{
game?.Players.LeaveGame(state.Mobile);
if (game == null)
return;
Mobile from = state.Mobile;
game.Players.LeaveGame(from);
}
public static void GivePoints(MahjongGame game, NetState state, PacketReader pvSrc)
@ -225,4 +230,4 @@ namespace Server.Engines.Mahjong
game.DealerIndicator.Move(new Point2D(x, y), direction, wind);
}
}
}
}

98
Projects/Scripts/Items/Games/Mahjong/MahjongPlayers.cs
View file

@ -1,5 +1,4 @@
using System.Collections.Generic;
using System.Linq;
namespace Server.Engines.Mahjong
{
@ -83,13 +82,28 @@ namespace Server.Engines.Mahjong
return m_InGame[index];
}
public bool IsInGamePlayer(Mobile mobile) => IsInGamePlayer(GetPlayerIndex(mobile));
public bool IsInGamePlayer(Mobile mobile)
{
int index = GetPlayerIndex(mobile);
return IsInGamePlayer(index);
}
public bool IsSpectator(Mobile mobile) => m_Spectators.Contains(mobile);
public bool IsSpectator(Mobile mobile) => m_Spectators.Contains(mobile);
public int GetScore(int index)
{
if (index < 0 || index >= m_Scores.Length)
return 0;
return m_Scores[index];
}
public bool IsPublic(int index) => index >= 0 && index < m_PublicHand.Length && m_PublicHand[index];
public bool IsPublic(int index)
{
if (index < 0 || index >= m_PublicHand.Length)
return false;
return m_PublicHand[index];
}
public void SetPublic(int index, bool value)
{
@ -108,7 +122,10 @@ namespace Server.Engines.Mahjong
{
List<Mobile> list = new List<Mobile>();
if (players) list.AddRange(m_Players.Where((t, i) => IsInGamePlayer(i)));
if (players)
for (int i = 0; i < m_Players.Length; i++)
if (IsInGamePlayer(i))
list.Add(m_Players[i]);
if (spectators)
list.AddRange(m_Spectators);
@ -152,7 +169,7 @@ namespace Server.Engines.Mahjong
{
m_InGame[i] = false;
MahjongPackets.SendMahjongRelieve(player.NetState, Game);
player.Send(new MahjongRelieve(Game));
SendPlayerExitMessage(player);
UpdateDealer(true);
@ -167,16 +184,20 @@ namespace Server.Engines.Mahjong
Mobile mobile = m_Spectators[i];
if (mobile.NetState == null || mobile.Deleted)
{
m_Spectators.RemoveAt(i);
}
else if (!Game.IsAccessibleTo(mobile) || mobile.Map != Game.Map ||
!mobile.InRange(Game.GetWorldLocation(), 5))
{
m_Spectators.RemoveAt(i);
MahjongPackets.SendMahjongRelieve(mobile.NetState, Game);
mobile.Send(new MahjongRelieve(Game));
}
else
{
i++;
}
}
if (removed && !UpdateSpectators())
@ -255,12 +276,12 @@ namespace Server.Engines.Mahjong
UpdateDealer(false);
if (sendJoinGame)
MahjongPackets.SendMahjongJoinGame(player.NetState, Game);
player.Send(new MahjongJoinGame(Game));
SendPlayersPacket(true, true);
MahjongPackets.SendMahjongGeneralInfo(player.NetState, Game);
MahjongPackets.SendMahjongTilesInfo(player.NetState, Game, player);
player.Send(new MahjongGeneralInfo(Game));
player.Send(new MahjongTilesInfo(Game, player));
if (DealerPosition == index)
SendLocalizedMessage(1062773, player.Name); // ~1_name~ has entered the game as the dealer.
@ -268,14 +289,14 @@ namespace Server.Engines.Mahjong
SendLocalizedMessage(1062772, player.Name); // ~1_name~ has entered the game as a player.
}
private void AddSpectator(Mobile m)
private void AddSpectator(Mobile mobile)
{
if (!IsSpectator(m)) m_Spectators.Add(m);
if (!IsSpectator(mobile)) m_Spectators.Add(mobile);
MahjongPackets.SendMahjongJoinGame(m.NetState, Game);
MahjongPackets.SendMahjongPlayersInfo(m.NetState, Game, m);
MahjongPackets.SendMahjongGeneralInfo(m.NetState, Game);
MahjongPackets.SendMahjongTilesInfo(m.NetState, Game, m);
mobile.Send(new MahjongJoinGame(Game));
mobile.Send(new MahjongPlayersInfo(Game, mobile));
mobile.Send(new MahjongGeneralInfo(Game));
mobile.Send(new MahjongTilesInfo(Game, mobile));
}
public void Join(Mobile mobile)
@ -283,7 +304,9 @@ namespace Server.Engines.Mahjong
int index = GetPlayerIndex(mobile);
if (index >= 0)
{
AddPlayer(mobile, index, true);
}
else
{
int nextSeat = GetNextSeat();
@ -308,7 +331,9 @@ namespace Server.Engines.Mahjong
SendPlayersPacket(true, true);
}
else
{
m_Spectators.Remove(player);
}
}
public void ResetScores(int value)
@ -332,11 +357,13 @@ namespace Server.Engines.Mahjong
m_Scores[toPosition] += amount;
if (Game.ShowScores)
{
SendPlayersPacket(true, true);
}
else
{
MahjongPackets.SendMahjongPlayersInfo(from.NetState, Game, from);
MahjongPackets.SendMahjongPlayersInfo(to.NetState, Game, to);
from.Send(new MahjongPlayersInfo(Game, from));
to.Send(new MahjongPlayersInfo(Game, to));
}
SendLocalizedMessage(1062774,
@ -350,7 +377,7 @@ namespace Server.Engines.Mahjong
return;
if (m_InGame[index])
MahjongPackets.SendMahjongRelieve(player.NetState, Game);
player.Send(new MahjongRelieve(Game));
m_Players[index] = null;
@ -374,9 +401,9 @@ namespace Server.Engines.Mahjong
DealerPosition = index;
if (IsInGamePlayer(oldDealer))
MahjongPackets.SendMahjongPlayersInfo(m_Players[oldDealer].NetState, Game, m_Players[oldDealer]);
m_Players[oldDealer].Send(new MahjongPlayersInfo(Game, m_Players[oldDealer]));
MahjongPackets.SendMahjongPlayersInfo(to.NetState, Game, to);
to.Send(new MahjongPlayersInfo(Game, to));
SendDealerChangedMessage();
}
@ -395,25 +422,36 @@ namespace Server.Engines.Mahjong
public void SendPlayersPacket(bool players, bool spectators)
{
foreach (Mobile mobile in GetInGameMobiles(players, spectators))
MahjongPackets.SendMahjongPlayersInfo(mobile.NetState, Game, mobile);
mobile.Send(new MahjongPlayersInfo(Game, mobile));
}
public void SendGeneralPacket(bool players, bool spectators)
{
foreach (Mobile mobile in GetInGameMobiles(players, spectators))
MahjongPackets.SendMahjongGeneralInfo(mobile.NetState, Game);
List<Mobile> mobiles = GetInGameMobiles(players, spectators);
if (mobiles.Count == 0)
return;
MahjongGeneralInfo generalInfo = new MahjongGeneralInfo(Game);
generalInfo.Acquire();
foreach (Mobile mobile in mobiles)
mobile.Send(generalInfo);
generalInfo.Release();
}
public void SendTilesPacket(bool players, bool spectators)
{
foreach (Mobile mobile in GetInGameMobiles(players, spectators))
MahjongPackets.SendMahjongTilesInfo(mobile.NetState, Game, mobile);
mobile.Send(new MahjongTilesInfo(Game, mobile));
}
public void SendTilePacket(MahjongTile tile, bool players, bool spectators)
{
foreach (Mobile mobile in GetInGameMobiles(players, spectators))
MahjongPackets.SendMahjongTileInfo(mobile.NetState, tile, mobile);
mobile.Send(new MahjongTileInfo(tile, mobile));
}
public void SendRelievePacket(bool players, bool spectators)
@ -423,8 +461,14 @@ namespace Server.Engines.Mahjong
if (mobiles.Count == 0)
return;
MahjongRelieve relieve = new MahjongRelieve(Game);
relieve.Acquire();
foreach (Mobile mobile in mobiles)
MahjongPackets.SendMahjongRelieve(mobile.NetState, Game);
mobile.Send(relieve);
relieve.Release();
}
public void SendLocalizedMessage(int number)

238
Projects/Scripts/Items/Games/Mahjong/Packets.cs
View file

@ -1,78 +1,76 @@
using Server.Buffers;
using System.IO;
using Server.Network;
namespace Server.Engines.Mahjong
{
public static class MahjongPackets
public sealed class MahjongJoinGame : Packet
{
public static void SendMahjongJoinGame(NetState ns, MahjongGame game)
public MahjongJoinGame(MahjongGame game) : base(0xDA)
{
if (ns == null)
return;
EnsureCapacity(9);
SpanWriter writer = new SpanWriter(stackalloc byte[9]);
writer.Write((byte)0xDA); // Packet ID
writer.Write((ushort)0x09); // Dynamic Length
writer.Write(game.Serial);
writer.Write((short)0x19);
ns.Send(writer.Span);
m_Stream.Write(game.Serial);
m_Stream.Write((byte)0);
m_Stream.Write((byte)0x19);
}
}
public static void SendMahjongPlayersInfo(NetState ns, MahjongGame game, Mobile to)
public sealed class MahjongPlayersInfo : Packet
{
public MahjongPlayersInfo(MahjongGame game, Mobile to) : base(0xDA)
{
if (ns == null)
return;
MahjongPlayers players = game.Players;
SpanWriter writer = new SpanWriter(stackalloc byte[11 + 45 * players.Seats]);
writer.Write((byte)0xDA); // Packet ID
writer.Position += 2; // Dynamic Length
writer.Write(game.Serial);
writer.Write((short)0x02);
writer.Write((short)players.Seats);
EnsureCapacity(11 + 45 * players.Seats);
short n = 0;
m_Stream.Write(game.Serial);
m_Stream.Write((byte)0);
m_Stream.Write((byte)0x2);
m_Stream.Write((byte)0);
m_Stream.Write((byte)players.Seats);
int n = 0;
for (int i = 0; i < players.Seats; i++)
{
Mobile mobile = players.GetPlayer(i);
if (mobile != null)
{
writer.Write(mobile.Serial);
writer.Write(players.DealerPosition == i ? (byte)0x1 : (byte)0x2);
writer.Write((byte)i);
m_Stream.Write(mobile.Serial);
m_Stream.Write(players.DealerPosition == i ? (byte)0x1 : (byte)0x2);
m_Stream.Write((byte)i);
if (game.ShowScores || mobile == to)
writer.Write(players.GetScore(i));
m_Stream.Write(players.GetScore(i));
else
writer.Position++; // writer.Write(0);
m_Stream.Write(0);
writer.Position += 3;
m_Stream.Write((short)0);
m_Stream.Write((byte)0);
writer.Write(players.IsPublic(i));
m_Stream.Write(players.IsPublic(i));
writer.WriteAsciiFixed(mobile.Name, 30);
writer.Write(!players.IsInGamePlayer(i));
m_Stream.WriteAsciiFixed(mobile.Name, 30);
m_Stream.Write(!players.IsInGamePlayer(i));
n++;
}
else if (game.ShowScores)
{
writer.Position++; // writer.Write(0);
writer.Write((byte)0x2);
writer.Write((byte)i);
m_Stream.Write(0);
m_Stream.Write((byte)0x2);
m_Stream.Write((byte)i);
writer.Write(players.GetScore(i));
m_Stream.Write(players.GetScore(i));
writer.Position += 3;
m_Stream.Write((short)0);
m_Stream.Write((byte)0);
writer.Write(players.IsPublic(i));
m_Stream.Write(players.IsPublic(i));
writer.Position += 30; //writer.WriteAsciiFixed("", 30);
writer.Write((byte)0x1); // true
m_Stream.WriteAsciiFixed("", 30);
m_Stream.Write(true);
n++;
}
@ -80,66 +78,58 @@ namespace Server.Engines.Mahjong
if (n != players.Seats)
{
writer.Position = 9;
writer.Write(n);
m_Stream.Seek(10, SeekOrigin.Begin);
m_Stream.Write((byte)n);
}
writer.Position = 1;
writer.Write((short)writer.WrittenCount);
ns.Send(writer.Span);
}
}
public static void SendMahjongGeneralInfo(NetState ns, MahjongGame game)
public sealed class MahjongGeneralInfo : Packet
{
public MahjongGeneralInfo(MahjongGame game) : base(0xDA)
{
if (ns == null)
return;
EnsureCapacity(13);
SpanWriter writer = new SpanWriter(stackalloc byte[25]);
writer.Write((byte)0xDA); // Packet ID
writer.Write((ushort)25); // Dynamic Length
m_Stream.Write(game.Serial);
m_Stream.Write((byte)0);
m_Stream.Write((byte)0x5);
writer.Write(game.Serial);
writer.Write((short)0x05);
m_Stream.Write((short)0);
m_Stream.Write((byte)0);
writer.Position += 3;
m_Stream.Write((byte)((game.ShowScores ? 0x1 : 0x0) | (game.SpectatorVision ? 0x2 : 0x0)));
writer.Write((byte)((game.ShowScores ? 0x1 : 0x0) | (game.SpectatorVision ? 0x2 : 0x0)));
m_Stream.Write((byte)game.Dices.First);
m_Stream.Write((byte)game.Dices.Second);
writer.Write((byte)game.Dices.First);
writer.Write((byte)game.Dices.Second);
m_Stream.Write((byte)game.DealerIndicator.Wind);
m_Stream.Write((short)game.DealerIndicator.Position.Y);
m_Stream.Write((short)game.DealerIndicator.Position.X);
m_Stream.Write((byte)game.DealerIndicator.Direction);
writer.Write((byte)game.DealerIndicator.Wind);
writer.Write((short)game.DealerIndicator.Position.Y);
writer.Write((short)game.DealerIndicator.Position.X);
writer.Write((byte)game.DealerIndicator.Direction);
writer.Write((short)game.WallBreakIndicator.Position.Y);
writer.Write((short)game.WallBreakIndicator.Position.X);
ns.Send(writer.Span);
m_Stream.Write((short)game.WallBreakIndicator.Position.Y);
m_Stream.Write((short)game.WallBreakIndicator.Position.X);
}
}
public static void SendMahjongTilesInfo(NetState ns, MahjongGame game, Mobile to)
public sealed class MahjongTilesInfo : Packet
{
public MahjongTilesInfo(MahjongGame game, Mobile to) : base(0xDA)
{
if (ns == null)
return;
MahjongTile[] tiles = game.Tiles;
MahjongPlayers players = game.Players;
int length = 11 + 9 * tiles.Length;
SpanWriter writer = new SpanWriter(stackalloc byte[length]);
writer.Write((byte)0xDA); // Packet ID
writer.Write((short)length); // Dynamic Length
EnsureCapacity(11 + 9 * tiles.Length);
writer.Write(game.Serial);
writer.Write((short)0x4);
m_Stream.Write(game.Serial);
m_Stream.Write((byte)0);
m_Stream.Write((byte)0x4);
writer.Write((short)tiles.Length);
m_Stream.Write((short)tiles.Length);
foreach (MahjongTile tile in tiles)
{
writer.Write((byte)tile.Number);
m_Stream.Write((byte)tile.Number);
if (tile.Flipped)
{
@ -147,40 +137,39 @@ namespace Server.Engines.Mahjong
if (hand < 0 || players.IsPublic(hand) || players.GetPlayer(hand) == to ||
game.SpectatorVision && players.IsSpectator(to))
writer.Write((byte)tile.Value);
m_Stream.Write((byte)tile.Value);
else
writer.Position++;
m_Stream.Write((byte)0);
}
else
writer.Position++;
{
m_Stream.Write((byte)0);
}
writer.Write((short)tile.Position.Y);
writer.Write((short)tile.Position.X);
writer.Write((byte)tile.StackLevel);
writer.Write((byte)tile.Direction);
m_Stream.Write((short)tile.Position.Y);
m_Stream.Write((short)tile.Position.X);
m_Stream.Write((byte)tile.StackLevel);
m_Stream.Write((byte)tile.Direction);
writer.Write(tile.Flipped ? (byte)0x10 : (byte)0x0);
m_Stream.Write(tile.Flipped ? (byte)0x10 : (byte)0x0);
}
ns.Send(writer.Span);
}
}
public static void SendMahjongTileInfo(NetState ns, MahjongTile tile, Mobile to)
public sealed class MahjongTileInfo : Packet
{
public MahjongTileInfo(MahjongTile tile, Mobile to) : base(0xDA)
{
if (ns == null)
return;
MahjongGame game = tile.Game;
MahjongPlayers players = game.Players;
SpanWriter writer = new SpanWriter(stackalloc byte[18]);
writer.Write((byte)0xDA); // Packet ID
writer.Write((short)18); // Dynamic Length
EnsureCapacity(18);
writer.Write(game.Serial);
writer.Write((short)0x3);
m_Stream.Write(tile.Game.Serial);
m_Stream.Write((byte)0);
m_Stream.Write((byte)0x3);
writer.Write((byte)tile.Number);
m_Stream.Write((byte)tile.Number);
if (tile.Flipped)
{
@ -188,36 +177,33 @@ namespace Server.Engines.Mahjong
if (hand < 0 || players.IsPublic(hand) || players.GetPlayer(hand) == to ||
game.SpectatorVision && players.IsSpectator(to))
writer.Write((byte)tile.Value);
m_Stream.Write((byte)tile.Value);
else
writer.Position++;
m_Stream.Write((byte)0);
}
else
writer.Position++;
{
m_Stream.Write((byte)0);
}
writer.Write((short)tile.Position.Y);
writer.Write((short)tile.Position.X);
writer.Write((byte)tile.StackLevel);
writer.Write((byte)tile.Direction);
m_Stream.Write((short)tile.Position.Y);
m_Stream.Write((short)tile.Position.X);
m_Stream.Write((byte)tile.StackLevel);
m_Stream.Write((byte)tile.Direction);
writer.Write(tile.Flipped ? (byte)0x10 : (byte)0x0);
ns.Send(writer.Span);
}
public static void SendMahjongRelieve(NetState ns, MahjongGame game)
{
if (ns == null)
return;
SpanWriter writer = new SpanWriter(stackalloc byte[18]);
writer.Write((byte)0xDA); // Packet ID
writer.Write((short)18); // Dynamic Length
writer.Write(game.Serial);
writer.Write((short)0x1A);
ns.Send(writer.Span);
m_Stream.Write(tile.Flipped ? (byte)0x10 : (byte)0x0);
}
}
}
public sealed class MahjongRelieve : Packet
{
public MahjongRelieve(MahjongGame game) : base(0xDA)
{
EnsureCapacity(9);
m_Stream.Write(game.Serial);
m_Stream.Write((byte)0);
m_Stream.Write((byte)0x1A);
}
}
}