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

23
Projects/UOContent/Items/Misc/BankCheck.cs
View file

@ -153,19 +153,16 @@ namespace Server.Items
public override void OnSingleClick(Mobile from)
{
from.Send(
new MessageLocalizedAffix(
Serial,
ItemID,
MessageType.Label,
0x3B2,
3,
1041361,
"",
AffixType.Append,
$" {m_Worth}",
""
)
from.NetState.SendMessageLocalizedAffix(
Serial,
ItemID,
MessageType.Label,
0x3B2,
3,
1041361,
"",
AffixType.Append,
$" {m_Worth}"
); // A bank check:
}

8
Projects/UOContent/Items/Misc/Corpses/Corpse.cs
View file

@ -1168,7 +1168,7 @@ namespace Server.Items
if (opl.Header > 0)
{
from.Send(new MessageLocalized(Serial, ItemID, MessageType.Label, hue, 3, opl.Header, Name, opl.HeaderArgs));
from.NetState.SendMessageLocalized(Serial, ItemID, MessageType.Label, hue, 3, opl.Header, Name, opl.HeaderArgs);
}
}
@ -1180,16 +1180,16 @@ namespace Server.Items
{
if (m_CorpseName != null)
{
from.Send(new AsciiMessage(Serial, ItemID, MessageType.Label, hue, 3, "", m_CorpseName));
from.NetState.SendMessage(Serial, ItemID, MessageType.Label, hue, 3, true, null, "", m_CorpseName);
}
else
{
from.Send(new MessageLocalized(Serial, ItemID, MessageType.Label, hue, 3, 1046414, "", Name));
from.NetState.SendMessageLocalized(Serial, ItemID, MessageType.Label, hue, 3, 1046414, "", Name);
}
}
else // Bone form
{
from.Send(new MessageLocalized(Serial, ItemID, MessageType.Label, hue, 3, 1046414, "", Name));
from.NetState.SendMessageLocalized(Serial, ItemID, MessageType.Label, hue, 3, 1046414, "", Name);
}
}

6
Projects/UOContent/Items/Misc/Key.cs
View file

@ -249,14 +249,14 @@ namespace Server.Items
{
desc = "(blank)";
}
else if ((desc = m_Description) == null || (desc = desc.Trim()).Length <= 0)
else
{
desc = "";
desc = m_Description?.Trim() ?? "";
}
if (desc.Length > 0)
{
from.Send(new UnicodeMessage(Serial, ItemID, MessageType.Regular, 0x3B2, 3, "ENU", "", desc));
from.NetState.SendMessage(Serial, ItemID, MessageType.Regular, 0x3B2, 3, false, "ENU", "", desc);
}
}

22
Projects/UOContent/Items/Misc/PowerGenerator.cs
View file

@ -216,18 +216,18 @@ namespace Server.Items
public void DoDamage(Mobile to)
{
to.Send(
new UnicodeMessage(
Serial,
ItemID,
MessageType.Regular,
0x3B2,
3,
"",
"",
"The generator shoots an arc of electricity at you!"
)
to.NetState.SendMessage(
Serial,
ItemID,
MessageType.Regular,
0x3B2,
3,
false,
"ENU",
"",
"The generator shoots an arc of electricity at you!"
);
to.BoltEffect(0);
to.LocalOverheadMessage(MessageType.Regular, 0xC9, true, "* Your body convulses from electric shock *");
to.NonlocalOverheadMessage(MessageType.Regular, 0xC9, true, $"* {to.Name} spasms from electric shock *");

40
Projects/UOContent/Items/Misc/Teleporter.cs
View file

@ -429,32 +429,28 @@ namespace Server.Items
{
if (m_MessageString != null)
{
m.Send(
new UnicodeMessage(
Serial,
ItemID,
MessageType.Regular,
0x3B2,
3,
"ENU",
null,
m_MessageString
)
m.NetState.SendMessage(
Serial,
ItemID,
MessageType.Regular,
0x3B2,
3,
false,
"ENU",
null,
m_MessageString
);
}
else if (m_MessageNumber != 0)
{
m.Send(
new MessageLocalized(
Serial,
ItemID,
MessageType.Regular,
0x3B2,
3,
m_MessageNumber,
null,
""
)
m.NetState.SendMessageLocalized(
Serial,
ItemID,
MessageType.Regular,
0x3B2,
3,
m_MessageNumber,
null
);
}