diff options
| author | stonedDiscord <Tukz@gmx.de> | 2022-07-16 13:58:05 +0200 |
|---|---|---|
| committer | stonedDiscord <Tukz@gmx.de> | 2022-07-16 13:58:05 +0200 |
| commit | f4c6e6b40d27536f1079a5ad7d9a267852daae3e (patch) | |
| tree | 9832158b6ab5bcb7b0581bc6342d601eedcbf470 /webAO | |
| parent | c36149dac5d8de3cae6e263db3ee36e7ad322e7e (diff) | |
| parent | abcba2ff9b3a884952492364fe6b5fe28a6c617f (diff) | |
Merge branch 'deskmod'
Diffstat (limited to 'webAO')
| -rw-r--r-- | webAO/client.ts | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/webAO/client.ts b/webAO/client.ts index 624d95f..3876011 100644 --- a/webAO/client.ts +++ b/webAO/client.ts @@ -343,7 +343,7 @@ class Client extends EventEmitter { /** * Sends an in-character chat message. - * @param {string} deskmod currently unused + * @param {string} deskmod controls the desk * @param {string} speaking who is speaking * @param {string} name the name of the current character * @param {string} silent whether or not it's silent @@ -1724,6 +1724,7 @@ class Client extends EventEmitter { preanim: emoteinfo[1].toLowerCase(), emote: emoteinfo[2].toLowerCase(), zoom: Number(emoteinfo[3]) || 0, + deskmod: Number(emoteinfo[4]) || 1, sfx: esfx.toLowerCase(), sfxdelay: esfxd, frame_screenshake: '', @@ -2659,7 +2660,7 @@ export function onEnter(event: KeyboardEvent) { client.sendIC( - 'chat', + myemo.deskmod, myemo.preanim, mychar.name, myemo.emote, |