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

Updates Message Packets (#321)

Browse source 
### API Breaking Change
Combined `AsciiMessage` and `UnicodeMessage` into a single function that takes two arguments, `bool ascii` and `string lang`. Lang can be null (or anything) if ascii is true. 

- [X] Changes message packets
- [X] Cleans up some code
- [X] Uses benchmarks to determine if the spanwriter + copyfrom
This commit is contained in:
Kamron Batman 2020-11-20 21:50:13 -08:00 • committed by GitHub
parent 10d884fe30
commit b6cd408623
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
59 changed files with 1160 additions and 1025 deletions
Download patch file Download diff file Expand all files Collapse all files

21
Projects/UOContent/Engines/ConPVP/Games/CTF.cs
View file

@ -291,17 +291,16 @@ namespace Server.Engines.ConPVP
{
if (Location == m_TeamInfo.Origin && Map == m_TeamInfo.Game.Facet)
{
from.Send(
new UnicodeMessage(
Serial,
ItemID,
MessageType.Regular,
0x3B2,
3,
"ENU",
Name,
"Touch me not for I am chaste."
)
from.NetState.SendMessage(
Serial,
ItemID,
MessageType.Regular,
0x3B2,
3,
false,
"ENU",
Name,
"Touch me not for I am chaste."
);
}
else

39
Projects/UOContent/Engines/Doom/LeverPuzzle/LeverPuzzleController.cs
View file

@ -487,38 +487,47 @@ namespace Server.Engines.Doom
public static void PlayerSendASCII(Mobile player, int index)
{
player.Send(
new AsciiMessage(
Serial.MinusOne,
0xFFFF,
MessageType.Label,
MsgParams[index][0],
MsgParams[index][1],
null,
Msgs[index]
)
player.NetState.SendMessage(
Serial.MinusOne,
0xFFFF,
MessageType.Label,
MsgParams[index][0],
MsgParams[index][1],
true,
null,
null,
Msgs[index]
);
}
/* I cant find any better way to send "speech" using fonts other than default */
public static void POHMessage(Mobile from, int index)
{
Packet p = new AsciiMessage(
Span<byte> buffer = stackalloc byte[OutgoingMessagePackets.GetMaxMessageLength(Msgs[index])];
var length = OutgoingMessagePackets.CreateMessage(
ref buffer,
from.Serial,
from.Body,
MessageType.Regular,
MsgParams[index][0],
MsgParams[index][1],
true,
null,
from.Name,
Msgs[index]
);
p.Acquire();
foreach (var state in from.Map.GetClientsInRange(from.Location))
buffer = buffer.Slice(0, length); // Adjust to the actual size
var eable = from.Map.GetClientsInRange(from.Location);
foreach (var state in eable)
{
state.Send(p);
state.Send(buffer);
}
Packet.Release(p);
eable.Free();
}
public override void Serialize(IGenericWriter writer)

4
Projects/UOContent/Engines/Factions/Items/Traps/BaseFactionTrap.cs
View file

@ -192,9 +192,7 @@ namespace Server.Factions
public void PrivateOverheadLocalizedMessage(Mobile to, int number, int hue, string name, string args)
{
var ns = to?.NetState;
ns?.Send(new MessageLocalized(Serial, ItemID, MessageType.Regular, hue, 3, number, name, args));
to?.NetState.SendMessageLocalized(Serial, ItemID, MessageType.Regular, hue, 3, number, name, args);
}
public virtual bool CheckDecay()

56
Projects/UOContent/Engines/MLQuests/Mobiles/SirHelper.cs
View file

@ -90,37 +90,35 @@ namespace Server.Engines.MLQuests.Mobiles
{
base.OnThink();
if (m_NextShout <= DateTime.UtcNow)
if (m_NextShout > DateTime.UtcNow)
{
Packet shoutPacket = null;
foreach (var state in GetClientsInRange(12))
{
var m = state.Mobile;
if (m.CanSee(this) && m.InLOS(this) && m.CanBeginAction(this))
{
shoutPacket ??= Packet.Acquire(
new MessageLocalized(
Serial,
Body,
MessageType.Regular,
946,
3,
1078099,
Name,
""
)
); // Double Click On Me For Help!
state.Send(shoutPacket);
}
}
Packet.Release(shoutPacket);
m_NextShout = DateTime.UtcNow + m_ShoutDelay;
return;
}
Span<byte> buffer = stackalloc byte[OutgoingMessagePackets.GetMaxMessageLocalizedLength("")];
var packetCreated = false;
foreach (var state in GetClientsInRange(12))
{
var m = state.Mobile;
if (m.CanSee(this) && m.InLOS(this) && m.CanBeginAction(this))
{
if (!packetCreated)
{
// Double Click On Me For Help!
var length = OutgoingMessagePackets.CreateMessageLocalized(
ref buffer,
Serial, Body, MessageType.Regular, 946, 3, 1078099, Name
);
packetCreated = true;
}
state.Send(buffer);
}
}
m_NextShout = DateTime.UtcNow + m_ShoutDelay;
}
private void EndLock(Mobile m)

187
Projects/UOContent/Engines/Party/Party.cs
View file

@ -239,22 +239,25 @@ namespace Server.Engines.PartySystem
return;
}
// : joined the party.
SendToAll(
new MessageLocalizedAffix(
Serial.MinusOne,
-1,
MessageType.Label,
0x3B2,
3,
1008094,
"",
AffixType.Prepend | AffixType.System,
from.Name,
""
)
Span<byte> buffer = stackalloc byte[OutgoingMessagePackets.GetMaxMessageLocalizedAffixLength(from.Name, "")];
var length = OutgoingMessagePackets.CreateMessageLocalizedAffix(
ref buffer,
Serial.MinusOne,
-1,
MessageType.Label,
0x3B2,
3,
1008094,
"",
AffixType.Prepend | AffixType.System,
from.Name
);
buffer = buffer.Slice(0, length); // Adjust to the actual size
// : joined the party.
SendToAll(ref buffer, true);
from.SendLocalizedMessage(1005445); // You have been added to the party.
Candidates.Remove(from);
@ -288,32 +291,31 @@ namespace Server.Engines.PartySystem
if (m == Leader)
{
Disband();
return;
}
else
for (var i = 0; i < Members.Count; ++i)
{
for (var i = 0; i < Members.Count; ++i)
if (Members[i].Mobile == m)
{
if (Members[i].Mobile == m)
{
Members.RemoveAt(i);
Members.RemoveAt(i);
m.Party = null;
m.Send(new PartyEmptyList(m));
m.Party = null;
m.Send(new PartyEmptyList(m));
m.SendLocalizedMessage(1005451); // You have been removed from the party.
m.SendLocalizedMessage(1005451); // You have been removed from the party.
SendToAll(new PartyRemoveMember(m, this));
SendToAll(1005452); // A player has been removed from your party.
SendToAll(new PartyRemoveMember(m, this));
SendToAll(1005452); // A player has been removed from your party.
break;
}
break;
}
}
if (Members.Count == 1)
{
SendToAll(1005450); // The last person has left the party...
Disband();
}
if (Members.Count == 1)
{
SendToAll(1005450); // The last person has left the party...
Disband();
}
}
@ -357,19 +359,16 @@ namespace Server.Engines.PartySystem
}
// : You are invited to join the party. Type /accept to join or /decline to decline the offer.
target.Send(
new MessageLocalizedAffix(
Serial.MinusOne,
-1,
MessageType.Label,
0x3B2,
3,
1008089,
"",
AffixType.Prepend | AffixType.System,
from.Name,
""
)
target.NetState.SendMessageLocalizedAffix(
Serial.MinusOne,
-1,
MessageType.Label,
0x3B2,
3,
1008089,
"",
AffixType.Prepend | AffixType.System,
from.Name
);
from.SendLocalizedMessage(1008090); // You have invited them to join the party.
@ -380,19 +379,17 @@ namespace Server.Engines.PartySystem
DeclineTimer.Start(target, from);
}
public void SendToAll(int number)
public void SendToAll(int number, string args = "", int hue = 0x3B2)
{
SendToAll(number, "", 0x3B2);
}
Span<byte> buffer = stackalloc byte[OutgoingMessagePackets.GetMaxMessageLocalizedLength(args)];
var length = OutgoingMessagePackets.CreateMessageLocalized(
ref buffer,
Serial.MinusOne, -1, MessageType.Regular, hue, 3, number, "System", args
);
public void SendToAll(int number, string args)
{
SendToAll(number, args, 0x3B2);
}
buffer = buffer.Slice(0, length); // Adjust to the actual size
public void SendToAll(int number, string args, int hue)
{
SendToAll(new MessageLocalized(Serial.MinusOne, -1, MessageType.Regular, hue, 3, number, "System", args));
SendToAll(ref buffer, true);
}
public void SendPublicMessage(Mobile from, string text)
@ -431,7 +428,20 @@ namespace Server.Engines.PartySystem
private void SendToStaffMessage(Mobile from, string text)
{
Packet p = null;
Span<byte> buffer = stackalloc byte[OutgoingMessagePackets.GetMaxMessageLength(text)];
var length = OutgoingMessagePackets.CreateMessage(
ref buffer,
from.Serial,
from.Body,
MessageType.Regular,
from.SpeechHue,
3,
false,
from.Language,
from.Name,
text
);
buffer = buffer.Slice(0, length); // Adjust to the actual size
foreach (var ns in from.GetClientsInRange(8))
{
@ -440,27 +450,9 @@ namespace Server.Engines.PartySystem
if (mob?.AccessLevel >= AccessLevel.GameMaster && mob.AccessLevel > from.AccessLevel &&
mob.Party != this && !m_Listeners.Contains(mob))
{
if (p == null)
{
p = Packet.Acquire(
new UnicodeMessage(
from.Serial,
from.Body,
MessageType.Regular,
from.SpeechHue,
3,
from.Language,
from.Name,
text
)
);
}
ns.Send(p);
ns.Send(buffer);
}
}
Packet.Release(p);
}
private void SendToStaffMessage(Mobile from, string format, params object[] args)
@ -477,7 +469,17 @@ namespace Server.Engines.PartySystem
Members[i].Mobile.Send(p);
}
if (p is MessageLocalized || p is MessageLocalizedAffix || p is UnicodeMessage || p is AsciiMessage)
p.Release();
}
public void SendToAll(ref Span<byte> span, bool isSpeech)
{
for (var i = 0; i < Members.Count; ++i)
{
Members[i].Mobile.NetState?.Send(span);
}
if (isSpeech)
{
for (var i = 0; i < m_Listeners.Count; ++i)
{
@ -485,12 +487,10 @@ namespace Server.Engines.PartySystem
if (mob.Party != this)
{
mob.Send(p);
mob.NetState?.Send(span);
}
}
}
p.Release();
}
private class RejoinTimer : Timer
@ -511,20 +511,22 @@ namespace Server.Engines.PartySystem
m_Mobile.SendLocalizedMessage(1005437); // You have rejoined the party.
m_Mobile.Send(new PartyMemberList(p));
var message = Packet.Acquire(
new MessageLocalizedAffix(
Serial.MinusOne,
-1,
MessageType.Label,
0x3B2,
3,
1008087,
"",
AffixType.Prepend | AffixType.System,
m_Mobile.Name,
""
)
Span<byte> buffer = stackalloc byte[OutgoingMessagePackets.GetMaxMessageLocalizedAffixLength(m_Mobile.Name, "")];
var length = OutgoingMessagePackets.CreateMessageLocalizedAffix(
ref buffer,
Serial.MinusOne,
-1,
MessageType.Label,
0x3B2,
3,
1008087,
"",
AffixType.Prepend | AffixType.System,
m_Mobile.Name
);
buffer = buffer.Slice(0, length); // Adjust to the actual size
var attrs = Packet.Acquire(new MobileAttributesN(m_Mobile));
foreach (var mi in p.Members)
@ -533,7 +535,7 @@ namespace Server.Engines.PartySystem
if (m != m_Mobile)
{
m.Send(message);
m.NetState?.Send(buffer);
m.Send(new MobileStatusCompact(m_Mobile.CanBeRenamedBy(m), m_Mobile));
m.Send(attrs);
m_Mobile.Send(new MobileStatusCompact(m.CanBeRenamedBy(m_Mobile), m));
@ -541,7 +543,6 @@ namespace Server.Engines.PartySystem
}
}
Packet.Release(message);
Packet.Release(attrs);
}
}

57
Projects/UOContent/Engines/Quests/Collector/Items/Obsidian.cs
View file

@ -189,17 +189,13 @@ namespace Server.Engines.Quests.Collector
{
if (!IsChildOf(from.Backpack))
{
from.Send(
new MessageLocalized(
Serial,
ItemID,
MessageType.Regular,
0x2C,
3,
500309,
"",
""
)
from.NetState.SendMessageLocalized(
Serial,
ItemID,
MessageType.Regular,
0x2C,
3,
500309
); // Nothing Happens.
}
else
@ -286,33 +282,30 @@ namespace Server.Engines.Quests.Collector
targObsidian.StatueName = RandomName(from);
}
from.Send(
new AsciiMessage(
targObsidian.Serial,
targObsidian.ItemID,
MessageType.Regular,
0x59,
3,
m_Obsidian.Name,
"Something Happened."
)
from.NetState.SendMessage(
targObsidian.Serial,
targObsidian.ItemID,
MessageType.Regular,
0x59,
3,
true,
null,
m_Obsidian.Name,
"Something Happened."
);
return;
}
}
from.Send(
new MessageLocalized(
m_Obsidian.Serial,
m_Obsidian.ItemID,
MessageType.Regular,
0x2C,
3,
500309,
m_Obsidian.Name,
""
)
from.NetState.SendMessageLocalized(
m_Obsidian.Serial,
m_Obsidian.ItemID,
MessageType.Regular,
0x2C,
3,
500309,
m_Obsidian.Name
); // Nothing Happens.
}
}

23
Projects/UOContent/Engines/Quests/Core/Items/EnchantedSextant.cs
View file

@ -102,18 +102,15 @@ namespace Server.Items
banks = m_IlshenarBanks;
moongates = PMList.Ilshenar;
#else
from.Send(
new MessageLocalized(
Serial,
ItemID,
MessageType.Label,
0x482,
3,
1061684,
"",
""
)
from.NetState.SendMessageLocalized(
Serial,
ItemID,
MessageType.Label,
0x482,
3,
1061684
); // The magic of the sextant fails...
return;
#endif
}
@ -176,7 +173,7 @@ namespace Server.Items
moonMsg = 1048018; // You are next to a Moongate at the moment.
}
from.Send(new MessageLocalized(Serial, ItemID, MessageType.Label, 0x482, 3, moonMsg, "", ""));
from.NetState.SendMessageLocalized(Serial, ItemID, MessageType.Label, 0x482, 3, moonMsg);
int bankMsg;
if (bankDistance == double.MaxValue)
@ -196,7 +193,7 @@ namespace Server.Items
bankMsg = 1048019; // You are next to a Bank at the moment.
}
from.Send(new MessageLocalized(Serial, ItemID, MessageType.Label, 0x5AA, 3, bankMsg, "", ""));
from.NetState.SendMessageLocalized(Serial, ItemID, MessageType.Label, 0x5AA, 3, bankMsg);
}
public override void Serialize(IGenericWriter writer)

38
Projects/UOContent/Engines/Quests/Uzeraan Turmoil/Items/SchmendrickApprenticeCorpse.cs
View file

@ -89,32 +89,26 @@ namespace Server.Engines.Quests.Haven
if (ItemID == 0x2006) // Corpse form
{
from.Send(
new MessageLocalized(
Serial,
ItemID,
MessageType.Label,
hue,
3,
1049144,
"",
Name
)
from.NetState.SendMessageLocalized(
Serial,
ItemID,
MessageType.Label,
hue,
3,
1049144,
"",
Name
); // the remains of ~1_NAME~ the apprentice
}
else
{
from.Send(
new MessageLocalized(
Serial,
ItemID,
MessageType.Label,
hue,
3,
1049145,
"",
""
)
from.NetState.SendMessageLocalized(
Serial,
ItemID,
MessageType.Label,
hue,
3,
1049145
); // the remains of a wizard's apprentice
}
}

38
Projects/UOContent/Engines/Quests/Uzeraan Turmoil/Mobiles/MilitiaFighter.cs
View file

@ -127,32 +127,26 @@ namespace Server.Engines.Quests.Haven
if (ItemID == 0x2006) // Corpse form
{
from.Send(
new MessageLocalized(
Serial,
ItemID,
MessageType.Label,
hue,
3,
1049318,
"",
Name
)
from.NetState.SendMessageLocalized(
Serial,
ItemID,
MessageType.Label,
hue,
3,
1049318,
"",
Name
); // the remains of ~1_NAME~ the militia fighter
}
else
{
from.Send(
new MessageLocalized(
Serial,
ItemID,
MessageType.Label,
hue,
3,
1049319,
"",
""
)
from.NetState.SendMessageLocalized(
Serial,
ItemID,
MessageType.Label,
hue,
3,
1049319
); // the remains of a militia fighter
}
}

2
Projects/UOContent/Engines/Quests/Witch Apprentice/Items/HagApprenticeCorpse.cs
View file

@ -48,7 +48,7 @@ namespace Server.Engines.Quests.Hag
{
var hue = Notoriety.GetHue(NotorietyHandlers.CorpseNotoriety(from, this));
from.Send(new AsciiMessage(Serial, ItemID, MessageType.Label, hue, 3, "", "a charred corpse"));
from.NetState.SendMessage(Serial, ItemID, MessageType.Label, hue, 3, true, null, "", "a charred corpse");
}
public override void Open(Mobile from, bool checkSelfLoot)