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

Updates Packets & Randomizer (#43)

Browse source 
* Fixes a bug with the main loop. Removes unnecessary optimizations for RDRand.

* WIP - Rewriting packets.

* Cleanup and updates README

* Converts more packets

* Fixes header

* Converts Effects packets.

* Forgot the send command

* Adds the start of containers packets.

* Adds message packets with caching

* Extends the send methods

* Starts to add Acquire methods

* Converted the packets

* Cleanup

* Cleanup

* Adds more packets

* Adds more packets

* Fixes clearing arrays from pool. Adds Mobile Incoming

* Converts more packets.

* Moves more packets

* Moves more packets

* Test compression

* Merges

* Migrating to an idiomatic syntax that also supports compression, and proxying.

* Optimize the stack alloc. Changes attributes

* Converted container packets

* Visual Studio doesn't auto save files. I am still getting used to subpar IDEs.

* Adds static packet caching. Will profile later. Converts more packets

* Fixes packets and changes how compression is configured

* WIP - Adds basics for Gumps. Not finished though.

* Fix file

* Fixes formatting

* Changed SpanWriter to be more idiomatic.

* Fixes Span vs RawSpan and missing stackallocs

* Converts over some more gumps

* WIP - Deletes 32bit support.

* Drops RDRand32 support.

* Fixes gump compilation

* Converting gump components

* Removes old huffman compression function

* Revert signature for backwards compatibility

* WIP - Converting more gump components

* Creates ArraySet for the strings. Updates AppendTo to reference that.

* Converts the maining gump components

* Cleans up gump components

* Cleans up directives

* Cleans up ArraySet and moves it. Adds null-coalescing-assignment

* Cleanup, Target Packets, and C# 8 changes.

* Removed OPL Packet

* World packets

* Fixing packet uses

* Cleans up code. Fixes packet uses in various places.

* More cleanup for packets

* Code cleanup

* Converts more packet uses and cleans up more code

* More code cleanup

* Finishes fixing the packets in Item

* Updates secure trade packets

* Updates core and gets it to compile.

* Moved packets to scripts. Fixed account handler use of packets

* Code cleanup

* Updates chat packets

* Code cleanuo

* Adds party packets, but need to implement them.

* Party packets WIP

* Finishes party packets

* Rearrange movement namespaces and classes

* Finishes plant packets

* Code Formatting

* Fixes moving effects

* Code cleanup, eliminates equipinfo

* Adds more packets. Fixes bugs with various packets.

* Finishes mahjon packets

* Fixes mahjong packet

* Code cleanup

* Finishes mahjong packets

* Adds Map packets

* Add multifacet maps and charts

* Cleans up some packets with UTF8

* Optimizes packets

* Cleans up more packets. Moves the MessageHelper

* Removes assistant support. Removes extended protocol. Incorporates MapUO packets as normal packets.

* Updates protocol extensions packet receiver

* Fixes a few bugs. Fixes a few more packets.

* Code cleanup and fixing more packets

* Fixes packet effects

* Cleaned up more code

* Buff Icon cleanup

* Removed unused constructors

* Code Cleanup. Adds BoatHS Packets

* Moves house files. Updates house foundation packets.

* Deployment cleanup

* Fixes:

* Code cleanup

* More code cleanup

* More code cleanup

* Cleaned up BaseHouse

* Enforces styling

* Converts foreach to linq where possible.

* Dont need that

* Goals/Readme updates

* Removes 32bit support at the highest level. Turns on HRT by default.

* Code cleanup. Fixes extended features packet.

* Fixes various bugs

* Code cleanup

* Code cleanup

* Code cleanup. Fixes gump X/Y assignment.

* Code cleanup using |= operator

* More code cleanup

* Cleanup

* Fixes spacing issues. Thanks Visual Studio. You suck.

* Compiler error

* Fixes NPE from RunUO 2.7

* Renames ScriptCompiler to AssemblyHandler. Fixes packets. Updates README

* Fixes more packets. Stupid trailing nulls.

* Fixes various bugs.

* Fixes for gumps

* Fixes more gump stuff. Going to split it out later since it is getting insane

* Recoded the gump writing

* WIP

* *Added output path of scripts project to dev branch
*Activated debugging in code
This commit is contained in:
Kamron Batman 2019-11-11 03:40:16 -08:00 • committed by 3HMonkey
parent 7aa8fd3df1
commit 179cb50557
588 changed files with 10843 additions and 16177 deletions
Download patch file Download diff file Expand all files Collapse all files

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

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