Skip to content

Commit 99dae1a

Browse files
committed
fix templates not working
1 parent 53b6cd9 commit 99dae1a

File tree

1 file changed

+13
-4
lines changed

1 file changed

+13
-4
lines changed

src/Utilities/ChatMessages.ts

Lines changed: 13 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -51,18 +51,27 @@ export function leaveMessage() {
5151
export function activityMessage(dict: ActivityInfo, entry: ResponsesEntryModel | undefined) {
5252
const source = getCharacter(dict.SourceCharacter.MemberNumber);
5353
const response = typedResponse(entry?.responses);
54+
const templatedResponse = replaceTemplate(response, source);
5455

55-
if (response.trim()[0] == "@") {
56-
return sendAction(response.slice(1), source);
56+
if (templatedResponse.trim()[0] == "@") {
57+
return sendAction(templatedResponse.slice(1), source);
5758
}
5859

59-
const finalMessage = response/* + moanDependingOnActivity(Player, entry?.responses, dict.ActivityName) */;
60+
const finalMessage = templatedResponse/* + moanDependingOnActivity(Player, entry?.responses, dict.ActivityName) */;
6061

6162
chatRoomAutoInterceptMessage(ElementValue("InputChat"), finalMessage, source);
6263
}
6364

6465
export function sendAction(action: string, sender: Character | null = null) {
65-
let msg = replaceTemplate(action, sender);
66+
let msg = action;
67+
const playerName = CharacterNickname(Player);
68+
69+
if (msg.trim()[0] !== "@") {
70+
msg = playerName + " " + msg.trim();
71+
} else {
72+
msg = msg.slice(1);
73+
}
74+
6675
ServerSend("ChatRoomChat", {
6776
Content: "Beep",
6877
Type: "Action",

0 commit comments

Comments
 (0)