From ec520d9146a68412a50fe04860fe813d8131e322 Mon Sep 17 00:00:00 2001 From: sD Date: Mon, 13 Jul 2020 18:31:33 +0200 Subject: add textfield for callwords --- webAO/client.html | 4 ++++ 1 file changed, 4 insertions(+) (limited to 'webAO') diff --git a/webAO/client.html b/webAO/client.html index 717f9ea..befeb25 100644 --- a/webAO/client.html +++ b/webAO/client.html @@ -401,6 +401,10 @@

+ +
+
↓ Only touch these settings if you know what you are doing. ↓

-- cgit From defaf5b6511588d3a00809979c9e0cf3ffd0766e Mon Sep 17 00:00:00 2001 From: sD Date: Mon, 13 Jul 2020 19:43:32 +0200 Subject: aa: match the border radius to the original game --- webAO/styles/chatbox/aa.css | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'webAO') diff --git a/webAO/styles/chatbox/aa.css b/webAO/styles/chatbox/aa.css index 0d6eff1..30c4884 100644 --- a/webAO/styles/chatbox/aa.css +++ b/webAO/styles/chatbox/aa.css @@ -100,7 +100,7 @@ border-color: rgba(255, 255, 255, 0.5); border-style: ridge groove groove ridge; border-width: 0.15em; - border-radius: 0.3em; + border-radius: 0.2em; background-color: rgba(0, 0, 16, 0.5); font-size: 1.6em; word-break: keep-all; -- cgit From 71e3a749d7a8de9c982e670f88eb2c08d3091565 Mon Sep 17 00:00:00 2001 From: sD Date: Tue, 14 Jul 2020 19:01:04 +0200 Subject: add a callword array and fill it when it's changed --- webAO/client.html | 2 +- webAO/client.js | 10 ++++++++++ 2 files changed, 11 insertions(+), 1 deletion(-) (limited to 'webAO') diff --git a/webAO/client.html b/webAO/client.html index befeb25..f6b3971 100644 --- a/webAO/client.html +++ b/webAO/client.html @@ -402,7 +402,7 @@

+ placeholder="Put 1 callword per line here" onchange="changeCallwords()">

↓ Only touch these settings if you know what you are doing. ↓ diff --git a/webAO/client.js b/webAO/client.js index 938c566..d4b6bc9 100644 --- a/webAO/client.js +++ b/webAO/client.js @@ -121,6 +121,8 @@ class Client extends EventEmitter { this.areas = []; this.musics = []; + this.callwords = []; + this.resources = { "holdit": { "src": AO_HOST + "misc/default/holdit_bubble.png", @@ -2201,6 +2203,14 @@ export function reloadTheme() { } window.reloadTheme = reloadTheme; +/** + * Triggered by a changed callword list + */ +export function changeCallwords() { + client.callwords = document.getElementById("client_callwords").value.split('\n'); +} +window.changeCallwords = changeCallwords; + /** * Triggered by the modcall sfx dropdown */ -- cgit From 98df57731191013688a7f26f736f3d0ecf7cc750 Mon Sep 17 00:00:00 2001 From: sD Date: Tue, 14 Jul 2020 19:16:28 +0200 Subject: add function to check the words --- webAO/client.js | 22 ++++++++++++++++++++++ 1 file changed, 22 insertions(+) (limited to 'webAO') diff --git a/webAO/client.js b/webAO/client.js index d4b6bc9..e3f4d95 100644 --- a/webAO/client.js +++ b/webAO/client.js @@ -1647,6 +1647,8 @@ async changeBackground(position) { appendICLog(this.chatmsg.content, displayname); + checkCallword(this.chatmsg.content); + // start checking the files try { const { url: speakUrl } = await this.oneSuccess([ @@ -2431,6 +2433,26 @@ function appendICLog(msg, name = "", time = new Date()) { lastICMessageTime = new Date(); } +/** + * check if the message contains an entry on our callword list + * @param {String} message + */ +export function checkCallword(message) { + client.callwords.forEach(testCallword); + + function testCallword(item) + { + if(item !== "" && message.includes(item)) + { + viewport.sfxaudio.pause(); + viewport.sfxaudio.src = AO_HOST + "sounds/general/sfx-gallery.wav"; + viewport.sfxaudio.play(); + } + } +} + + + /** * Triggered when the music search bar is changed * @param {MouseEvent} event -- cgit From c08ea7b7ea6c740299425e4325d946907720921e Mon Sep 17 00:00:00 2001 From: sD Date: Tue, 14 Jul 2020 19:18:59 +0200 Subject: case insensitivity --- webAO/client.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'webAO') diff --git a/webAO/client.js b/webAO/client.js index e3f4d95..1faca4c 100644 --- a/webAO/client.js +++ b/webAO/client.js @@ -2442,7 +2442,7 @@ export function checkCallword(message) { function testCallword(item) { - if(item !== "" && message.includes(item)) + if(item !== "" && message.toLowerCase().includes(item.toLowerCase())) { viewport.sfxaudio.pause(); viewport.sfxaudio.src = AO_HOST + "sounds/general/sfx-gallery.wav"; -- cgit From c1464118ab1900382d92c2b376cd080973fdc54b Mon Sep 17 00:00:00 2001 From: sD Date: Tue, 14 Jul 2020 19:20:39 +0200 Subject: put a label on it --- webAO/client.html | 2 ++ 1 file changed, 2 insertions(+) (limited to 'webAO') diff --git a/webAO/client.html b/webAO/client.html index f6b3971..c514bc2 100644 --- a/webAO/client.html +++ b/webAO/client.html @@ -401,6 +401,8 @@

+ +

-- cgit