From 7bec7c0489bb68b20e2d67d1db1c283e715e2aa7 Mon Sep 17 00:00:00 2001 From: Waverunner Date: Tue, 6 Jan 2015 13:07:34 -0500 Subject: [PATCH] Appropriate chat bubbles will now show depending on spatial type --- scripts/commands/generic/spatialChatInternal.py | 7 +++++-- src/intents/chat/SpatialChatIntent.java | 7 +++++-- src/services/chat/ChatService.java | 10 ++++------ 3 files changed, 14 insertions(+), 10 deletions(-) diff --git a/scripts/commands/generic/spatialChatInternal.py b/scripts/commands/generic/spatialChatInternal.py index caeaf39c7..5d7ba4db5 100644 --- a/scripts/commands/generic/spatialChatInternal.py +++ b/scripts/commands/generic/spatialChatInternal.py @@ -1,7 +1,10 @@ from intents.chat import SpatialChatIntent import sys +#Args: unkInt chatType moodId unkInt2 langId message def execute(objManager, player, target, args): - #Args: unkInt chatType moodId unkInt2 langId message - SpatialChatIntent(player, args.split(' ', 5)[5]).broadcast() + #print ('unkInt=' + cmdArgs[0] + ' chatType=' + cmdArgs[1] + ' moodId=' + cmdArgs[2] + ' unkInt2=' + cmdArgs[3] + ' langId=' + cmdArgs[4]) + + cmdArgs = args.split(' ', 5) + SpatialChatIntent(player, int(cmdArgs[1]), cmdArgs[5]).broadcast() return \ No newline at end of file diff --git a/src/intents/chat/SpatialChatIntent.java b/src/intents/chat/SpatialChatIntent.java index 4fb013ee9..df0034132 100644 --- a/src/intents/chat/SpatialChatIntent.java +++ b/src/intents/chat/SpatialChatIntent.java @@ -5,16 +5,19 @@ import resources.player.Player; public class SpatialChatIntent extends Intent { public static final String TYPE = "SpatialChatIntent"; - + private Player player; private String message; + private int chatType; - public SpatialChatIntent(Player player, String message) { + public SpatialChatIntent(Player player, int chatType, String message) { super(TYPE); this.player = player; this.message = message; + this.chatType = chatType; } public Player getPlayer() { return player; } public String getMessage() { return message; } + public int getChatType() { return chatType; } } diff --git a/src/services/chat/ChatService.java b/src/services/chat/ChatService.java index 93a1e279c..8228b1078 100644 --- a/src/services/chat/ChatService.java +++ b/src/services/chat/ChatService.java @@ -1,7 +1,5 @@ package services.chat; -import java.util.List; - import intents.GalacticPacketIntent; import intents.chat.SpatialChatIntent; import network.packets.Packet; @@ -51,20 +49,20 @@ public class ChatService extends Service { Player sender = i.getPlayer(); SWGObject actor = sender.getCreatureObject(); String chatMsg = i.getMessage(); + int chatType = i.getChatType(); // Send to self - SpatialChat message = new SpatialChat(actor.getObjectId(), 0, chatMsg, 0); + SpatialChat message = new SpatialChat(actor.getObjectId(), 0, chatMsg, chatType); ObjectController controller = new ObjectController(244, actor.getObjectId(), message); sender.sendPacket(controller); // Notify observers of the chat message - List observers = actor.getObservers(); - for (Player observer : observers) { + for (Player observer : actor.getObservers()) { if (observer.getCreatureObject() == null) continue; - message = new SpatialChat(actor.getObjectId(), 0, chatMsg, 0); + message = new SpatialChat(actor.getObjectId(), 0, chatMsg, chatType); controller = new ObjectController(244, observer.getCreatureObject().getObjectId(), message); observer.sendPacket(controller); }