Skip to content

Commit 0ad0ca0

Browse files
TimtyGTimtyG
committed
Feature Send Chat Bubble to all players
1 parent ed34321 commit 0ad0ca0

File tree

7 files changed

+173
-9
lines changed

7 files changed

+173
-9
lines changed

‎Framework/Intersect.Framework.Core/GameObjects/Events/Commands/EventCommands.cs‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -180,6 +180,10 @@ public partial class AddChatboxTextCommand : EventCommand
180180
public ChatboxChannel Channel { get; set; } = ChatboxChannel.Player;
181181

182182
public bool ShowChatBubble { get; set; }
183+
184+
//Control wheter the bubble is sent to all players
185+
public bool SendToAllPlayers { get; set; }
186+
183187
}
184188

185189
public partial class SetVariableCommand : EventCommand

‎Intersect.Editor/Forms/Editors/Events/Event Commands/EventCommand_ChatboxText.Designer.cs‎

Lines changed: 12 additions & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎Intersect.Editor/Forms/Editors/Events/Event Commands/EventCommand_ChatboxText.cs‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -35,6 +35,8 @@ public EventCommandChatboxText(AddChatboxTextCommand refCommand, FrmEvent editor
3535

3636
cmbChannel.SelectedIndex = (int) mMyCommand.Channel;
3737
chkShowChatBubble.Checked = mMyCommand.ShowChatBubble;
38+
39+
chkSendToAllPlayers.Checked = mMyCommand.SendToAllPlayers;
3840
}
3941

4042
private void InitLocalization()
@@ -50,6 +52,7 @@ private void InitLocalization()
5052
cmbChannel.Items.Add(Strings.EventChatboxText.channels[i]);
5153
}
5254
chkShowChatBubble.Text = Strings.EventChatboxText.ShowChatBubble;
55+
chkSendToAllPlayers.Text = Strings.EventChatboxText.SendToAllPlayers;
5356

5457
btnSave.Text = Strings.EventChatboxText.okay;
5558
btnCancel.Text = Strings.EventChatboxText.cancel;
@@ -61,6 +64,7 @@ private void btnSave_Click(object sender, EventArgs e)
6164
mMyCommand.Color = cmbColor.Text;
6265
mMyCommand.Channel = (ChatboxChannel) cmbChannel.SelectedIndex;
6366
mMyCommand.ShowChatBubble = chkShowChatBubble.Checked;
67+
mMyCommand.SendToAllPlayers = chkSendToAllPlayers.Checked;
6468
mEventEditor.FinishCommandEdit();
6569
}
6670

‎Intersect.Editor/Forms/Editors/Events/Event Commands/EventCommand_ChatboxText.resx‎

Lines changed: 120 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,120 @@
1+
<?xml version="1.0" encoding="utf-8"?>
2+
<root>
3+
<!--
4+
Microsoft ResX Schema
5+
6+
Version 2.0
7+
8+
The primary goals of this format is to allow a simple XML format
9+
that is mostly human readable. The generation and parsing of the
10+
various data types are done through the TypeConverter classes
11+
associated with the data types.
12+
13+
Example:
14+
15+
... ado.net/XML headers & schema ...
16+
<resheader name="resmimetype">text/microsoft-resx</resheader>
17+
<resheader name="version">2.0</resheader>
18+
<resheader name="reader">System.Resources.ResXResourceReader, System.Windows.Forms, ...</resheader>
19+
<resheader name="writer">System.Resources.ResXResourceWriter, System.Windows.Forms, ...</resheader>
20+
<data name="Name1"><value>this is my long string</value><comment>this is a comment</comment></data>
21+
<data name="Color1" type="System.Drawing.Color, System.Drawing">Blue</data>
22+
<data name="Bitmap1" mimetype="application/x-microsoft.net.object.binary.base64">
23+
<value>[base64 mime encoded serialized .NET Framework object]</value>
24+
</data>
25+
<data name="Icon1" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
26+
<value>[base64 mime encoded string representing a byte array form of the .NET Framework object]</value>
27+
<comment>This is a comment</comment>
28+
</data>
29+
30+
There are any number of "resheader" rows that contain simple
31+
name/value pairs.
32+
33+
Each data row contains a name, and value. The row also contains a
34+
type or mimetype. Type corresponds to a .NET class that support
35+
text/value conversion through the TypeConverter architecture.
36+
Classes that don't support this are serialized and stored with the
37+
mimetype set.
38+
39+
The mimetype is used for serialized objects, and tells the
40+
ResXResourceReader how to depersist the object. This is currently not
41+
extensible. For a given mimetype the value must be set accordingly:
42+
43+
Note - application/x-microsoft.net.object.binary.base64 is the format
44+
that the ResXResourceWriter will generate, however the reader can
45+
read any of the formats listed below.
46+
47+
mimetype: application/x-microsoft.net.object.binary.base64
48+
value : The object must be serialized with
49+
: System.Runtime.Serialization.Formatters.Binary.BinaryFormatter
50+
: and then encoded with base64 encoding.
51+
52+
mimetype: application/x-microsoft.net.object.soap.base64
53+
value : The object must be serialized with
54+
: System.Runtime.Serialization.Formatters.Soap.SoapFormatter
55+
: and then encoded with base64 encoding.
56+
57+
mimetype: application/x-microsoft.net.object.bytearray.base64
58+
value : The object must be serialized into a byte array
59+
: using a System.ComponentModel.TypeConverter
60+
: and then encoded with base64 encoding.
61+
-->
62+
<xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
63+
<xsd:import namespace="http://www.w3.org/XML/1998/namespace" />
64+
<xsd:element name="root" msdata:IsDataSet="true">
65+
<xsd:complexType>
66+
<xsd:choice maxOccurs="unbounded">
67+
<xsd:element name="metadata">
68+
<xsd:complexType>
69+
<xsd:sequence>
70+
<xsd:element name="value" type="xsd:string" minOccurs="0" />
71+
</xsd:sequence>
72+
<xsd:attribute name="name" use="required" type="xsd:string" />
73+
<xsd:attribute name="type" type="xsd:string" />
74+
<xsd:attribute name="mimetype" type="xsd:string" />
75+
<xsd:attribute ref="xml:space" />
76+
</xsd:complexType>
77+
</xsd:element>
78+
<xsd:element name="assembly">
79+
<xsd:complexType>
80+
<xsd:attribute name="alias" type="xsd:string" />
81+
<xsd:attribute name="name" type="xsd:string" />
82+
</xsd:complexType>
83+
</xsd:element>
84+
<xsd:element name="data">
85+
<xsd:complexType>
86+
<xsd:sequence>
87+
<xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
88+
<xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />
89+
</xsd:sequence>
90+
<xsd:attribute name="name" type="xsd:string" use="required" msdata:Ordinal="1" />
91+
<xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" />
92+
<xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" />
93+
<xsd:attribute ref="xml:space" />
94+
</xsd:complexType>
95+
</xsd:element>
96+
<xsd:element name="resheader">
97+
<xsd:complexType>
98+
<xsd:sequence>
99+
<xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
100+
</xsd:sequence>
101+
<xsd:attribute name="name" type="xsd:string" use="required" />
102+
</xsd:complexType>
103+
</xsd:element>
104+
</xsd:choice>
105+
</xsd:complexType>
106+
</xsd:element>
107+
</xsd:schema>
108+
<resheader name="resmimetype">
109+
<value>text/microsoft-resx</value>
110+
</resheader>
111+
<resheader name="version">
112+
<value>2.0</value>
113+
</resheader>
114+
<resheader name="reader">
115+
<value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
116+
</resheader>
117+
<resheader name="writer">
118+
<value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
119+
</resheader>
120+
</root>

‎Intersect.Editor/Localization/Strings.cs‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1864,6 +1864,8 @@ public partial struct EventChatboxText
18641864

18651865
public static LocalizedString ShowChatBubble = @"Show Chat Bubble";
18661866

1867+
public static LocalizedString SendToAllPlayers = @"Send to All Players";
1868+
18671869
}
18681870

18691871
public partial struct EventCommandList

‎Intersect.Server.Core/Entities/Events/CommandProcessing.cs‎

Lines changed: 22 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -162,13 +162,28 @@ Stack<CommandInstance> callStack
162162

163163
if (command.ShowChatBubble)
164164
{
165-
PacketSender.SendChatBubbleToPlayer(
166-
player,
167-
instance.PageInstance.Id,
168-
instance.PageInstance.GetEntityType(),
169-
txt,
170-
instance.PageInstance.MapId
171-
);
165+
if (command.SendToAllPlayers) // If "Send to All" is enabled
166+
{
167+
// Send the chat bubble to all players in the map instance
168+
PacketSender.SendChatBubbleToAllPlayers(
169+
player,
170+
instance.PageInstance.Id,
171+
instance.PageInstance.GetEntityType(),
172+
txt,
173+
instance.PageInstance.MapId
174+
);
175+
}
176+
else
177+
{
178+
// Send the chat bubble to only the triggering player
179+
PacketSender.SendChatBubbleToPlayer(
180+
player,
181+
instance.PageInstance.Id,
182+
instance.PageInstance.GetEntityType(),
183+
txt,
184+
instance.PageInstance.MapId
185+
);
186+
}
172187
}
173188
}
174189

‎Intersect.Server.Core/Networking/PacketSender.cs‎

Lines changed: 9 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,8 @@
1919
using Intersect.Server.Maps;
2020
using Intersect.Utilities;
2121
using Newtonsoft.Json;
22+
using System.Diagnostics;
23+
2224

2325
namespace Intersect.Server.Networking;
2426

@@ -2044,9 +2046,15 @@ public static void SendChatBubble(Guid entityId, Guid mapInstanceId, EntityType
20442046
//ChatBubblePacket
20452047
public static void SendChatBubbleToPlayer(Player player, Guid entityId, EntityType type, string text, Guid mapId)
20462048
{
2047-
SendDataToProximityOnMapInstance(mapId, player.MapInstanceId, new ChatBubblePacket(entityId, type, mapId, text), null, TransmissionMode.Any);
2049+
player.SendPacket(new ChatBubblePacket(entityId, type, mapId, text));
20482050
}
20492051

2052+
public static void SendChatBubbleToAllPlayers(Player player, Guid entityId, EntityType type, string text, Guid mapId)
2053+
{
2054+
{
2055+
SendDataToProximityOnMapInstance(mapId, player.MapInstanceId, new ChatBubblePacket(entityId, type, mapId, text), null, TransmissionMode.Any);
2056+
}
2057+
}
20502058
//QuestOfferPacket
20512059
public static void SendQuestOffer(Player player, Guid questId)
20522060
{

0 commit comments

Comments
 (0)